Le Wang <[email protected]> writes: > 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?
Ediff offer the $$ keybinding for this. Don't hesitate to use ? in the ediff control buffer to have some help on it, there are some gems hidden there. -- Rémi Vanicat
