Show Git conflicts in IntelliJ-CodePudding

I use IntelliJ as an IDE and the terminal on Mac to do Github commands. I did a git rebase -i origin/main and there were some conflicts and an error saying:

error: could not apply 7d4bdfs7...
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

How can I display those conflicts in IntelliJ so that I can merge them manually?

CodePudding user response：

From

From there, clicking on one of those entries give you the window to resolve the merge conflict:

CodePudding user response：

You can install git gui. After that, to see changes or conflicts, just run command git gui, it will show all the changed/uncommited files in the GUI based view.