Question

我正在使用git并尝试合并导致合并冲突的分支我尝试将vimdiff配置为带有

的mergetool

git config merge.tool vimdiff
git config merge.conflictstyle diff3
git config mergetool.prompt false

以下是发生的事情

$ git merge master
CONFLICT (rename/delete): dev_tools+env_config/gnome-term_+_bash+tmux.sh deleted in HEAD and renamed in master.  
Version master of dev_tools+env_config/gnome-term_+_bash+tmux.sh left in tree.
Automatic merge failed; fix conflicts and then commit the result.

$ git status
On branch breaking_changes_test

You have unmerged paths.
  (fix conflicts and run "git commit")

Unmerged paths:
  (use "git add <file>..." to mark resolution)

        added by them:      dev_tools+env_config/gnome-term_+_bash+tmux.sh

no changes added to commit (use "git add" and/or "git commit -a")

$ git mergetool
Merging:
dev_tools+env_config/gnome-term_+_bash+tmux.sh

Deleted merge conflict for 'dev_tools+env_config/gnome-term_+_bash+tmux.sh':
  {local}: deleted
  {remote}: created file
Use (c)reated or (d)eleted file, or (a)bort?

当我运行git mergetool时，我希望vimdiff能够打开，显示冲突文件之间的差异。
如何启动vimdiff？

Answer 1

Vimdiff没有启动，因为没有这样的冲突需要解决。这只是一个文件存在于一个分支中而不存在于另一个分支中的情况。 Git只是询问要保留哪个文件，创建的文件或删除的文件。

当我尝试解决git合并冲突时，vimdiff没有启动

1 个答案: