help-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

How to navigate to next git conflict?


From: Hi-Angel
Subject: How to navigate to next git conflict?
Date: Tue, 29 Jan 2019 10:51:01 +0300

For working with git I noted one of frequent actions I do is resolving
conflicts. I'm comfortable to work with most of that from terminal
(I've got a completion in zsh and what not…) except that conflict
navigation could use a bit of automation.

So far I only managed to find `smerge-next`, but it is limited to the
focused buffer, in there I can as well search for a HEAD or <<<
markers, so not really useful.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]