Show a “resolve merge conflicts” dialog for a file

问题:

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?

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

回答1:

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