From: Stefan Monnier <monnier@iro.umontreal.ca>
To: help-gnu-emacs@gnu.org
Subject: Re: How to navigate to next git conflict?
Date: Tue, 29 Jan 2019 04:42:06 -0500 [thread overview]
Message-ID: <jwv4l9rrecg.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: CAHGDjgCrtVLqB8udGMJ-_=vXjcYrWSKESSTxSo0dBUOvs6JDLQ@mail.gmail.com
> 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.
There's also `vc-find-conflicted-file` to go to the next file with
conflicts when you're done with one.
Stefan
next prev parent reply other threads:[~2019-01-29 9:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-29 7:51 How to navigate to next git conflict? Hi-Angel
2019-01-29 9:42 ` Stefan Monnier [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwv4l9rrecg.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--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.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.