gitgit-mergemerge-conflict-resolution

How can I force IntelliJ to resolve conflicts, which are already committed in a file by another person


Using GIT, I checked out a branch from the remote repository, which another person had worked on. One of the files has conflicts, which are already committed, so the file contains marks like <<<<<<< HEAD etc. Now, is there any way to run IntelliJ conflicts resolving tool, to resolve these conflicts? Or do I need to resolve them by hand?


Solution

  • when conflict happens, you can use the built-in merge tool, do this steps -

    do this steps , so you dont have to manually edit the conflicted code.

    but yes , once the conflict markers are committed, Git no longer considers them as conflicts and now that is part of the file content.

    you can still do like this -