I used to do conflict resolution with P4merge. I found it OK but I didn't pay any attention to how it does the job under the hood. Until very recently I realized that it tries to make the merge by itself. As a result it doesn't show the same conflicts as git does and that frustrated my manager (like in
let's switch back to clearcase frustrated).
The question is: git adds annotations to a file that can't merge similar to these
<<<<<<< HEAD this code ======= the other code >>>>>>> feature/branch-name
Is there a graphical tool that reads these annotations and then gives you the option to keep the one or the other and then remove the annotations?
The tool should be for Linux and preferably free but since the organization will take care of the cost, it can be paid as well.
UPDATE: kdiff3 trial
kdiff3 doesn't respect annotations either. First of all the setup didn't work but no big deal, I've changed the
[mergetool "kdiff3"] cmd = /path/to/kdiff3 $BASE $REMOTE $LOCAL -o $MERGED
and it worked. But then
kdiff3 reported this:
Not exactly what I expected: I had 4 conflicts and the tool says there are 2. Also the
Nr of automatically solved conflicts message makes me think that
kdiff3 applies its own merging algorithm, which is the opposite of what we want.