[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: How to navigate to next git conflict?
|
From: |
Stefan Monnier |
|
Subject: |
Re: How to navigate to next git conflict? |
|
Date: |
Tue, 29 Jan 2019 04:42:06 -0500 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) |
> 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