Merge conflict resolution
When two people changed the same line, this shows you both versions side by side and lets you pick.
When you would want it
A conflict is the one moment source control cannot decide for you, and the raw markers it leaves in the file are genuinely hard to read.
Where to find it
- All Features → Merge conflict resolution
- Settings → adcode.git.mergeConflict
What you get out of it
- You resolve conflict by conflict without losing your place.
- Both sides stay visible while you decide - no mental diffing of marker soup.
- Manual editing stays available for the cases no button anticipates.
How to use it, step by step
- Pull or merge as usual; conflicted files are listed in Source Control.
- Open one - both versions appear clearly marked, side by side.
- Above each conflict choose Keep yours, Keep theirs, or Keep both.
- Hand-edit the merged result where none of the buttons fit.
- Save, stage the file, and commit the merge.
Why this beats the usual way
Raw conflict markers ('<<<<<<< HEAD') are git's most notorious reading experience, and lightweight editors leave them untouched. ADCode renders the choices as buttons over both versions - the thing paid IDEs charge for, included.
Find it in Universal Search
Merge conflict resolution · Git