Hi, I know of 2 ways to merge conflicts.
First: 1: Go to "Unmerged ..." line 2. Press <enter> to open the file 3. M-x vc-resolve-conflict Second 1. Go to "Unmerged ..." line 2. Press <e> to start 3-way merge When I use the second method, I have to step past all merges without conflict. Is there some way to skip to next conflict in the second method?
