From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" 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 10:31:44 -0500 Message-ID: References: <865xykr79f.fsf@gnu.org> Reply-To: Stefan Monnier Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="28570"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 69220@debbugs.gnu.org, Konstantin Kharlamov To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Feb 19 16:33:02 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 1rc5de-0007EM-9s for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 19 Feb 2024 16:33:02 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rc5dL-0003GL-9y; Mon, 19 Feb 2024 10:32:43 -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 1rc5dJ-0003G9-Pu for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 10:32:41 -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 1rc5dJ-0007D2-Hm for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 10:32:41 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rc5de-0006Hd-Bf for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 10:33:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 19 Feb 2024 15:33: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.170835673524084 (code B ref 69220); Mon, 19 Feb 2024 15:33:02 +0000 Original-Received: (at 69220) by debbugs.gnu.org; 19 Feb 2024 15:32:15 +0000 Original-Received: from localhost ([127.0.0.1]:43199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc5ct-0006GO-5P for submit@debbugs.gnu.org; Mon, 19 Feb 2024 10:32:15 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:51581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc5cq-0006G8-GW for 69220@debbugs.gnu.org; Mon, 19 Feb 2024 10:32:13 -0500 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id C4F1680841; Mon, 19 Feb 2024 10:31:45 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1708356704; bh=mWyylgylbCgeo2kaisxjWv98FZelVlLKuMNZoHUUF1A=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=BiwURWYocCJFCUeoRinf8Qas8t00/s5cUajL5UnCy7vjxleijfi8pybXLYMZ0z2dr rR281DRJcVzurplRAD5e8LyoYVcmT6hf9FSNO9zeVvBnE16TqHCJtttoB3BiI52kRY ICcTHFuCd6NTLk8J1hSQrcHuns4mEGOLzCJ2uweAWfl9upLT01DvLylKQx+h5OT2Qh 5ZCGTldhNE66tMZ9HBNmdnOWDUlxChOMSFpBTV2lce+XZUkOQuUD3toxLxC+4VFcXs ae0OKKpXMzzlujmCtpWxOVtvwfhZUs7ZKXqWjncFOKdw0wW6/s+CaSrzuxDeUSKLtA RxKkqNjGQKgbg== Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id DC7FE8014F; Mon, 19 Feb 2024 10:31:44 -0500 (EST) Original-Received: from milanesa (unknown [23.233.149.155]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id BC4DA12068A; Mon, 19 Feb 2024 10:31:44 -0500 (EST) In-Reply-To: <865xykr79f.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 19 Feb 2024 14:03:08 +0200") 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:280270 Archived-At: > 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. Yeah, I'm not sure we need this. It would be easy enough to provide a kind of prefix command `smerge-apply-all-conflicts` which reads the next key and calls the corresponding command in every conflict in the file. It would generalize `smerge-resolve-all`. I have needed such a thing in the past, but there are several ways to do that already: beside telling Git beforehand how to resolve the conflicts, you can also use things like C-x ( C-c ^ n C-c ^ u C-x e e e e e e e e e - Stefan