From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov 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 17:20:45 +0200 Message-ID: <4eed07a3-1df5-48f9-be9a-1655721118f1@gutov.dev> References: <865xykr79f.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11281"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla Thunderbird Cc: 69220@debbugs.gnu.org To: Eli Zaretskii , Konstantin Kharlamov , Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Feb 19 16:21:51 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 1rc5Sn-0002iB-HZ for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 19 Feb 2024 16:21:50 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rc5Si-0001Ec-4r; Mon, 19 Feb 2024 10:21:45 -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 1rc5Sg-0001Cx-10 for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 10:21:42 -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 1rc5Se-0005Ba-HA for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 10:21:41 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rc5Sz-0005zL-KY for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 10:22:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 19 Feb 2024 15:22:01 +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.170835607722948 (code B ref 69220); Mon, 19 Feb 2024 15:22:01 +0000 Original-Received: (at 69220) by debbugs.gnu.org; 19 Feb 2024 15:21:17 +0000 Original-Received: from localhost ([127.0.0.1]:43185 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc5SH-0005y4-6W for submit@debbugs.gnu.org; Mon, 19 Feb 2024 10:21:17 -0500 Original-Received: from out2-smtp.messagingengine.com ([66.111.4.26]:34517) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc5SF-0005xr-QJ for 69220@debbugs.gnu.org; Mon, 19 Feb 2024 10:21:16 -0500 Original-Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.nyi.internal (Postfix) with ESMTP id 5D49E5C00BB; Mon, 19 Feb 2024 10:20:49 -0500 (EST) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Mon, 19 Feb 2024 10:20:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1708356049; x=1708442449; bh=KmmsaCD8mA/LL/Zcoil5f8Cb2djoU3QlPLZl0hnMPqQ=; b= RANecLTDdEtlc1uedfdoALgQvleXzJR2oC5jW6AtSya+7TeZzkiBKsMRfjzYnt4G E3fQXOAAvHZ60bG1U/6HS3dnacjl1N6fgaNv9V63qzxRBSnGLlA8WQ+HgZGGR+AJ NmoZ1u7yjOIM8QiqMylVD85Z7VrjBxKAGzWUJ88SUIA3Tykc7nUqLTgJn5wJlmVE 5PkVgT3EIMIQFRJwChL73FQCxrAmtR9Yl+1xv5/QYsXq4R2/M9fLXDyWfR+4emaK m3AixN3/rtKOyXjlRHbtgiaGLz770he3qhC8mHLLLQ9kKc+6FaKv7BkBjAGCiE2I z6HkDHlFcHH/VgC1/N4NbA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1708356049; x= 1708442449; bh=KmmsaCD8mA/LL/Zcoil5f8Cb2djoU3QlPLZl0hnMPqQ=; b=a rw/kLLo7ewp/r1/6Q99p9HCr1jL8oRQXC1SGAXwf9jiK93EYiOYqicMRVEZriesf OrNfAp7wQV2odLeCE8DEyALcZ4PruWSMrfEDYOVbtjUWGh7M5BfRQYGhPza1oCge GWaeh6KuVPpsZjtrK//vAq0paPHXxXlNVmzVlcousY74E0RLw4+SAMp0wTAGC56D LtfsH+5fzfRiROk2+oUDMbBmXJrCLw/5myofsLlpZpNgR4PisnhQ2hJV7tuLYHV3 nSqGV4j5ttBPNIWQ8QmWpzsFlZNqGCXEKP00uBzX1tAED8eqCAPY2slVQlIxEVYC ycBWfFivAgBpOHLSkCPCw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdekgdejfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefkffggfgfuvfevfhfhjggtgfesthejredttddvjeenucfhrhhomhepffhmihht rhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvghvqeenucggtffrrghtth gvrhhnpeetudeljeegheetgfehgeejkeeuhedvveeikeeufedtvddtveefhfdvveegudej heenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegumh hithhrhiesghhuthhovhdruggvvh X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 19 Feb 2024 10:20:47 -0500 (EST) Content-Language: en-US In-Reply-To: <865xykr79f.fsf@gnu.org> 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:280269 Archived-At: On 19/02/2024 14:03, Eli Zaretskii wrote: > 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. Like Andreas described, doing a merge using an "ours" or "theirs" strategy is something that people do on occasion. Whether it's a good option to be able to do in smerge as well, I don't have a relevant experience to comment on, but the patch looks short enough, so the added complexity is minimal.