IJ Idea merge conflict resolution window and the conflicts in plain text differ
Answered
Please take a look at the following two screen shots. The first one is the conflict resolution window.
And the below one is just the plain text with the conflicts highlighted
If you take a look at the plain text version, there's only one conflict. But in the conflict resolution window, it seems as though there are multiple conflicts. I'm sure I'm either missing something or I have an incorrect assumption about something. Could you please give an explanation for this situation?
Please sign in to leave a comment.
> it seems as though there are multiple conflicts
Conflicts are highlighted in red. Blue is not a conflict, but just a diff between base and respective revision.
If you click Apply all non-conflicting changes, they will be applied. Git does this automatically. IDEA does not. If you want IDE to auto-apply all non-conflicting changes, you can enable it in Settings | Tools | Diff & Merge
It is unclear whey the conflict is not highlighted as such but without seeng the entire content of panels it is hard to tell. Is the code in the Result pane correct after pressing Apply all non conflicting changes -> All?
Oh yes, if I click that everything sets up correctly. I just wanted to make clear the difference between the two windows. Thanks a lot