Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
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?
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
]xand[xmappings,]=for navigation within a conflict, and even corresponding text objectsaxanda=.