Why does 'git mergetool' (meld) show confl

2019-03-13 16:49发布

问题:

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:

回答1:

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