unofficial mirror of help-gnu-emacs@gnu.org
 help / color / mirror / Atom feed
* How to navigate to next git conflict?
@ 2019-01-29  7:51 Hi-Angel
  2019-01-29  9:42 ` Stefan Monnier
  0 siblings, 1 reply; 9+ messages in thread
From: Hi-Angel @ 2019-01-29  7:51 UTC (permalink / raw)
  To: help-gnu-emacs

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.



^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2019-02-10 22:00 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-29  7:51 How to navigate to next git conflict? Hi-Angel
2019-01-29  9:42 ` Stefan Monnier
2019-02-06 11:37   ` Hi-Angel
2019-02-06 14:11     ` Stefan Monnier
2019-02-06 14:47       ` Hi-Angel
2019-02-06 15:30         ` Stefan Monnier
2019-02-06 21:22           ` Hi-Angel
2019-02-06 21:34             ` tomas
2019-02-10 22:00               ` Hi-Angel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).