From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file Date: Mon, 19 Feb 2024 14:03:08 +0200 Message-ID: <865xykr79f.fsf@gnu.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="27655"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 69220@debbugs.gnu.org To: Konstantin Kharlamov , Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Feb 19 13:04:11 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rc2NX-0006wY-NG for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 19 Feb 2024 13:04:11 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rc2NB-0005gt-Jx; Mon, 19 Feb 2024 07:03:49 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rc2N8-0005gW-5u for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 07:03:46 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rc2N3-0006LZ-FT for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 07:03:45 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rc2NO-0006C2-4l for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 07:04:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 19 Feb 2024 12:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69220 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 69220-submit@debbugs.gnu.org id=B69220.170834422423777 (code B ref 69220); Mon, 19 Feb 2024 12:04:02 +0000 Original-Received: (at 69220) by debbugs.gnu.org; 19 Feb 2024 12:03:44 +0000 Original-Received: from localhost ([127.0.0.1]:40510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc2N5-0006BQ-Uw for submit@debbugs.gnu.org; Mon, 19 Feb 2024 07:03:44 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:54806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc2N0-0006BB-AH for 69220@debbugs.gnu.org; Mon, 19 Feb 2024 07:03:42 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rc2MZ-0006In-LO; Mon, 19 Feb 2024 07:03:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=IFZFqWZpx3qI3GZrfIhru/jfTNeVrcGXANhYeBuF2Ns=; b=Nz8q73ytFT84mI7qnZIO C44teK4z8LjqvBmbjBenQIPMugv6Vd011Tq9JguMlYxwI+raN/lxniODQWaIXL554D0deice4Is3Y dkJ7gGUckhBPm1TFIFqMQPsDGygtSlh9a3e1WQGOleun8kTOqxQh9rVrhBfoW4K6eKVS1zOKCKsoE taviHYVEZtTNrOID9YwaEihkbMGIsZ3XmPpTXwCuqpjPW6V56fSsbD9gHggm3wIt5VejEl4yiom7D N0dfvbdH4V2BkH1UJZWB7qVzPzpRM1AQ6EOs69ETjSq7DK52xjTBOz5XPz5hozYcvnC20KmhYklFg uIG0N9LjU01RMg==; In-Reply-To: (message from Konstantin Kharlamov on Sat, 17 Feb 2024 13:16:14 +0300) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:280245 Archived-At: > From: Konstantin Kharlamov > Date: Sat, 17 Feb 2024 13:16:14 +0300 > > This implements a feature request from here¹ about having a function to > resolve all conflicts simultaneously. Although question author didn't > reply, but either way I think it's a useful functional. I needed it so > many times, but before stumbling upon this question I just didn't know > there are functions `smerge-keep-upper/base/lower`, and so ofc I never > though of writing a new one that would apply them to all conflicts. I use SMerge quite a lot, but never yet had a situation where the same resolution was applicable to all of the conflicts, let alone knew that in advance, before looking at each conflict. I'm also guessing one could have the same effect by giving a prefix argument of suitable value to the conflict-resolution command. Having said that, if this is deemed useful, why not? Adding Stefan to the discussion, in case he has comments. I'd also be interested in Dmitry's opinions. Thanks.