显示“解决合并冲突". intellij中文件的对话框 [英] Show a "resolve merge conflicts" dialog for a file in intellij

问题描述

我已经完成了git pull，普通合并标记现在在原始文件中可用，并且在Intellij项目中可见:

I have done a git pull and the normal merge markers are now available in the original file and visible within the Intellij project:

有没有办法显示此文件的三面板合并冲突解决对话框?

Is there a way to show the three panel merge conflict resolution dialog for this file?

注意:有一个命令行工具可以很好地执行此操作-但是我实际上正在Intellij中寻找某种方式.命令行方法是通过git mergetool:

Note: there is a command line tool to do this that works well - but I am looking actually for some way within Intellij. The command line approach is via git mergetool :

git config --global merge.tool meld  # opendiff is another option here
git mergetool -y

推荐答案

右键单击文件，选择Git |在上下文菜单中解决冲突....

Right-click the file, select Git | Resolve Conflicts... in the context menu.

这篇关于显示“解决合并冲突". intellij中文件的对话框的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！