CODEWITHSUNDEEP
intellij-idea
WestCoastProjects
WestCoastProjects

Reputation: 63062

Show a "resolve merge conflicts" dialog for a file in 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:

enter image description here

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

Upvotes: 17

Views: 45549

Answers (3)

lyds
lyds

Reputation: 21

you can also use VCS main menu > VCS Operations Popup > Resolve conflicts

Upvotes: 2

tonderaimuchada
tonderaimuchada

Reputation: 233

In IntelliJ 2019.3.5, right click the 'VCS' menu in the top menu, navigate to 'Git' and choose 'Resolve Conflicts...', as shown in the attached screenshot:

enter image description here.

Upvotes: 4

yole
yole

Reputation: 97148

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

Upvotes: 33

Related Questions