Navigate to next conflict with vimdiff

vim vi merge-conflict-resolution vimdiff
Andreas Järliden picture Andreas Järliden · Jan 17, 2013 · Viewed 24.2k times · Source

In vimdiff you can use [c and ]c to go to the previous or next change, but when doing three-way merging many of those changes are not conflicts. Is there a command to go to the next conflict, not the next change as in e.g. Kaleidoscope?

Answer

Ingo Karkat picture Ingo Karkat · Jan 17, 2013

You mean conflict markers such as <<<<<<<, =======, and >>>>>>> on merges to indicate that the automatic resolution failed?!

You can use my ConflictMotions plugin for that; it provides ]x and [x mappings, ]= for navigation within a conflict, and even corresponding text objects ax and a=.

Related questions

How do I exit the Vim editor?

I'm stuck and cannot escape. It says: "type :quit<Enter> to quit VIM" But when I type that it simply appears in the object body.

Read More
Tab key == 4 spaces and auto-indent after curly braces in Vim

How do I make vi-Vim never use tabs (converting spaces to tabs, bad!), makes the tab key == 4 spaces, and automatically indent code after curly brace blocks like Emacs does? Also, how do I save these settings so I never have …

Read More
Copy all the lines to clipboard

Is there any way to copy all lines from open file to clipboard in VI editor. I tried yG but it's not using clipboard to store those lines. So is it possible?

Read More