0

I asked a previous question regarding the command "git merge -X theirs B" I used to merge two branches.

The final result was that the merge was "up to date" but in reality there remained differences between the two branches, "git diff A..B" return differences between four files.

So my question is: How can I "smash" the branch A with all the content of branch B ?

IMSoP
  • 77,988
  • 8
  • 99
  • 149
tt0686
  • 1,681
  • 5
  • 27
  • 52
  • Note that the middle one of the three duplicates ('is there a "theirs" version of "git merge -s ours"') has, as its accepted answer, the wrong answer: `-X theirs` doesn't do what is wanted here. However, some of the *other* answers are good. – torek Oct 13 '21 at 01:42

0 Answers0