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

孤者浪人 提交于 2019-12-20 10:46:09

问题


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



来源:https://stackoverflow.com/questions/7501666/why-does-git-mergetool-meld-show-conflict-markers

易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!