Intellij no longer showing "Resolve Conflicts" dialog?

Question

I have routinely used the (excellent) Intellij/Pycharm "Resolve Conflicts" available by right clicking in any source file in the project and accessing from the "Git" submenu. However the Git menu no longer shows it:

We can confirm that git is an "unresolved conflict" state by running git status that returns

fatal: Exiting because of an unresolved conflict.

This has happened several times in different git repos now. I am on Intellij Ultimate 20.2.

Update I just installed latest Intellij Ultimate 20.3: same issue.

Answer 1

I had similar problem because I used "Pull" option instead of "Merge". So be sure you use "Merge".

Answer 2

On mac I had issue with not agreed terms of the Xcode's software license agreements. It popped up after I hit refresh on Intellij Git window: Intellij Git

Simply had to open console and agree with terms after running command sudo xcodebuild -license

After that "Resolve Conflicts" was visible again

Answer 3

You can always switch to Commit in the left column and click on resolve there:

Answer 4

It's now buried under a submenu. From @RuslanKuleshov (Jetbrains employee):

The issue is here: https://youtrack.jetbrains.com/issue/IDEA-257569 ,