How can I merge two branches with magit interactively line by line. Important there is no conflict (well ONLY for git it isn't) but I still want to do this.
4
3
- Press M-x magit-status
- Press m in magit status
- Activate the "No fast-forward" switch and do Merge but don't commit Action and press m again
- Now your files are changed but not committed, so you can merge them with your last commit state when you press e above the changed files that will bring you ediff and you're able to review the changes
Hope this will help you out.
M-x emerge-filesthem. (See more on how emerge works here), this is even more hardcore thangit reset --hard HEAD^1 && git difftool -t <call Emacs Ediff> HEAD^1 HEAD. But neither of them would be my choice. I typically do the initial merge in whatever quick way possible and then ammend the rest of the changes after merge. I've not seen yet a comfortable diffing tool. – wvxvw Feb 3 '16 at 19:41