From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.help Subject: Re: How to navigate to next git conflict? Date: Tue, 29 Jan 2019 04:42:06 -0500 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="57581"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Tue Jan 29 10:43:16 2019 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1goPvG-000Eqs-D8 for geh-help-gnu-emacs@m.gmane.org; Tue, 29 Jan 2019 10:43:14 +0100 Original-Received: from localhost ([127.0.0.1]:46126 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goPvF-0008KV-5v for geh-help-gnu-emacs@m.gmane.org; Tue, 29 Jan 2019 04:43:13 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:42536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goPuP-0008Jb-2R for help-gnu-emacs@gnu.org; Tue, 29 Jan 2019 04:42:21 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goPuM-0002ax-L0 for help-gnu-emacs@gnu.org; Tue, 29 Jan 2019 04:42:19 -0500 Original-Received: from [195.159.176.226] (port=51390 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1goPuM-0002Zr-Dw for help-gnu-emacs@gnu.org; Tue, 29 Jan 2019 04:42:18 -0500 Original-Received: from list by blaine.gmane.org with local (Exim 4.89) (envelope-from ) id 1goPuG-000DfS-TF for help-gnu-emacs@gnu.org; Tue, 29 Jan 2019 10:42:12 +0100 X-Injected-Via-Gmane: http://gmane.org/ Cancel-Lock: sha1:u0bju5TQb//BWHGMCZaFGsiGfWA= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 195.159.176.226 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "help-gnu-emacs" Xref: news.gmane.org gmane.emacs.help:119176 Archived-At: > 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