Problems with git merge

Question

Problems with git merge

Navigation

#1 by (1 votes)

2

Well, I'm having a problem I've never had before with git ..

In our flow we have a branch called DEV that is where all the others leave. And all the completed tasks go through a DEV merge to branch and then a pull request is created for DEV (to avoid conflict, I do not know if it's the correct one, but the flow is this) and after the code review is done the merge.

What happened was that a branch came out of the DEV and some normal comits were created:

DEV ------------o---o--o---o---------------
BRANCH    \----o----o----o---

After some changes, the developer merge the DEV into the branch and created a commit.

DEV ------------o---o--o---o---------------
BRANCH    \----o----o----o---\--0 (merge commit)--o-/

I was analyzing the merge commit and had no file, it was simply a merge commit with no change and that's where the problem starts.

If I do the merge using git merge dev within the branch yet some of the changes do not see, even though I have not moved the specific files that should come.

But if I create a branch of the last commit before the merge and merge the changes comes. Only after the merge does everything go bizarre.

Does anyone have any tips?

git

asked by anonymous 13.08.2018 / 20:08

1 answer

Media queries are not applying the css according to device width what does "string" mean in CSS? [closed]

score 1 · Accepted Answer

Paul, when such strange situations occur with Git, you need to know which commands were used.

From what he described, it seems that the merge made in the branch gave conflicts and the user simply solved everything by accepting only his changes (refusing all other changes of the dev branch).

In addition, I would open a new branch of dev and would make a cherry-pick of each commit of the old branch (taking the merges, of course) for the new branch.