java: how to access git conflict merge tools?
I have heard that intellij has tools to help merge conflicts.
I did:
git checkout develop
git pull
git checkout mybranch
git merge develop
to pull the latest changes into my feature branch. There are a lot of conflicts, but intellij seems to offer no help.
I can see the ==========> type text injections git puts in there in the normal intellij java editor window, but intellij doesnt seem to recognize them other than as syntax errors.
how does one open or access merge conflict tools in intellij? I cant even find a way to look at my version and the incoming version, I have to use two bitbucket windows to display them which is extremly tedious.
Because resolving them by hand is so difficult, I have messed it up. Any ideas how I get back to start again? I tried using intellij “rollback” on the conflicted file I was editing, but now it has dissapeard from the list of conflicted files (so have lost the conflicts)
intellij 2024.1.1 on windows 10.
Please sign in to leave a comment.
Hi,
Can you share a screenshot of the state?
Conflicts should be displayed next to file names in the Commit window.
Example: