为什么'git mergetool'（meld）显示冲突标记？ [英] Why does 'git mergetool' (meld) show conflict markers?

问题描述

为什么'git mergetool'（meld）向我展示带有conclict标记的祖先视图？这是完全错误的，我从来不明白为什么会这样做。如何修复它？

3路合并应该显示

  [你的变化] [共同基础] [上游变化] 
  

我得到的是：

  [我的更改] [带有冲突标记的文件] [上游更改] 
  

请参阅：

解决方案

看起来您没有在配置中正确完成参数名称。你应该看到诸如$ BASE，$ REMOTE等东西。确保它们符合'meld'文档中的规定。

或

您偶然发现了一个未解决的文件。检查这是否做了一个 git log -s'<<<<<<<< / $ c c>并看看是否有什么东西回来了。如果确实如此，那么情况就是这样。

希望这有助于

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:

解决方案

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

这篇关于为什么'git mergetool'（meld）显示冲突标记？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！