CODEWITHSUNDEEP
gitversion-controlmergemeld3-way-merge
Mark Renouf
Mark Renouf

Reputation: 30990

Why does 'git mergetool' (meld) show conflict markers?

Why does 'git mergetool' (meld) show me the ancestor view WITH conclict markers? This is totally wrong and I've never understood why it does this. How can I fix it?

A 3 way merge should show

[ Your Changes ]          [ Common Base ]            [ Upstream Changes ]

What I get is:

[ My Changes   ]   [ File with Conflict markers ]    [ Upstream changes ]

See: Sample Screenshot

Upvotes: 12

Views: 4679

Answers (1)

Adam Dymitruk
Adam Dymitruk

Reputation: 129526

looks like you don't have the parameter names done correctly in the config. You should see things like $BASE, $REMOTE, etc. Make sure these are as specified in the documentation for 'meld'

OR

you have committed, by accident, an unresolved file. To check for this do a git log -S'<<<<<<' and see if anything comes back. If it does, then this is the case.

hope this helps

Upvotes: 2

Related Questions