Intellij no longer showing "Resolve Conflicts" dialog?
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.
Solution
It's now buried under a submenu. From @RuslanKuleshov (Jetbrains employee):
The issue is here: https://youtrack.jetbrains.com/issue/IDEA-257569 ,
- git commit signing failed: secret key not available
- VS Code not recognizing that I have user name and email set for git
- gpg failed to sign the data fatal: failed to write commit object [Git 2.10.0]
- Git clone stuck from Jenkins pipeline
- How can I get a list of Git branches, ordered by most recent commit?
- Should Gemfile.lock be included in .gitignore?
- How to solve "Unable to find git in your PATH" on Flutter?
- Can I make git recognize a UTF-16 file as text?
- How do I undo the most recent local commits in Git?
- What are the consequences of making `develop` the default branch on GitHub?
- Why can't my github app bypass branch protection
- How can I solve "fatal: Invalid credentials" error when pushing to Bitbucket?
- Sonarqube: Missing blame information for the following files
- How do I delete a Git branch locally and remotely?
- Why is git log significantly slower when outputting to a tty?
- How to fix "ssh: connect to host github.com port 22: Connection timed out" for git push/pull/... commands?
- Git corrupted? `reword` of `git rebase -i` suddenly stopped working
- Referring to the branch of the current working directory with unstaged changes as a branch
- How to cherry pick from 1 branch to another
- Git fatal: protocol 'https' is not supported
- Retrieve specific commit from a remote Git repository
- MacOS Monterey and Android Studio Bumblebee, "Git is not installed"
- Squash all my commits into one for GitHub pull request
- Cannot ignore .idea/workspace.xml - keeps popping up
- What is the proper way to generate, store, and configure an SSH public/private key pair for git repository usage on Assembla?
- How to show git log with commit numbers?
- Git: how can I retrieve all branches that are protected?
- How can I filter the results of 'git fsck --unreachable'
- How to squash all git commits into one?
- What does it mean to squash commits in git?