5

I want to merge two branches, git thinks there is no conflict however it is. So I want to merge the two branches interactively line by line preferably with emacs ediff, however other tools should be ok.

I am really new to git, so please be verbose.

atevm
  • 801
  • 1
  • 14
  • 27

1 Answers1

4

Merging in steps interactively will be done with the "--no-commit" option. (which does the merge but pretend it failed and not commits. Thus you have a chance to see and change result of merge)

Check out these links - they are more detailed and some also supply solution to the merge tool embedding.

GitHub: git selective merge

Stack: scroll down here - there are like 3 solutions : git-interactive-merge

Community
  • 1
  • 1
Ethan Halprin
  • 470
  • 3
  • 11