unofficial mirror of help-gnu-emacs@gnu.org
 help / color / mirror / Atom feed
From: Hi-Angel <hiangel999@gmail.com>
To: help-gnu-emacs@gnu.org
Subject: How to navigate to next git conflict?
Date: Tue, 29 Jan 2019 10:51:01 +0300	[thread overview]
Message-ID: <CAHGDjgCrtVLqB8udGMJ-_=vXjcYrWSKESSTxSo0dBUOvs6JDLQ@mail.gmail.com> (raw)

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	other threads:[~2019-01-29  7:51 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-29  7:51 Hi-Angel [this message]
2019-01-29  9:42 ` How to navigate to next git conflict? 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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAHGDjgCrtVLqB8udGMJ-_=vXjcYrWSKESSTxSo0dBUOvs6JDLQ@mail.gmail.com' \
    --to=hiangel999@gmail.com \
    --cc=help-gnu-emacs@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).