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#74509: Feature request - smerge-mode Date: Sun, 01 Dec 2024 18:51:22 -0500 Message-ID: References: <86bjxx817w.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="40472"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Branislav =?UTF-8?Q?Zahradn=C3=ADk?= , 74509@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Dec 02 00:52:21 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 1tHtjg-000AOz-N9 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 02 Dec 2024 00:52:21 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tHtjR-00088x-DJ; Sun, 01 Dec 2024 18:52:05 -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 1tHtjP-00088W-Jm for bug-gnu-emacs@gnu.org; Sun, 01 Dec 2024 18:52:03 -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 1tHtjP-0005TJ-41 for bug-gnu-emacs@gnu.org; Sun, 01 Dec 2024 18:52:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=+HvBcl2Iojr0lHAeD7LSvokx/YVJHpj1dIjV0y4ZeCY=; b=jU3Xnubcw1Yrlba6mUelYBlcfWPk6GxzhxtRxqvdZ8i+I6wSXO3MswEtICLK0LbxG5oud/MmHaHnQkGTIDH/6qOgmnYMkaQY9cQHF0lB2e8OG+Ys0eLK3/A6HyfTZBWESJgne8PXuc9q9/Kr5xZ4Y5r+icGjRO+IRKl1Cx+OPicjknhKd41m1OA/ivFEVuKsXm/3WSFZInXHhPEOCgx7Rpu5JmmwuPI/qTuOB5DZcqp3aG7DaECbYFV/rhYYmbl3joPEAS//6xXmGZkOEf4FSvsqBzE9XIs2RVFG0uxyjzFuK/39/qSlmHuxjk/KVenmtBudODnAoVCDHtCYsUKLxw==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tHtjN-0000Ai-To for bug-gnu-emacs@gnu.org; Sun, 01 Dec 2024 18:52:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 01 Dec 2024 23:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74509 X-GNU-PR-Package: emacs Original-Received: via spool by 74509-submit@debbugs.gnu.org id=B74509.1733097092616 (code B ref 74509); Sun, 01 Dec 2024 23:52:01 +0000 Original-Received: (at 74509) by debbugs.gnu.org; 1 Dec 2024 23:51:32 +0000 Original-Received: from localhost ([127.0.0.1]:53484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHtiu-00009s-1r for submit@debbugs.gnu.org; Sun, 01 Dec 2024 18:51:32 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:57370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHtir-00009Y-Vo for 74509@debbugs.gnu.org; Sun, 01 Dec 2024 18:51:30 -0500 Original-Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 1B2DD4443F9; Sun, 1 Dec 2024 18:51:24 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1733097082; bh=LqgDSiy+0eFiT8n0Jk0TVDlnW915+29QtDInnJrBnjc=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=XtFxGTxsnzfVm8AKtSNocwJGzxNSPKHFutSFopwNMIVikyINhO1YRfGr0Xfle3ouV NKg9u1FaIrMWHutp6z8avUUaz4ILVOxFmUeQcLy8tr0jNV8u216a0xqy6rO3T1HeqL BDD+Yhqq5lHQkgnwUGU4NR3jVOOFFo3ETqeM/o8Uvnx6ulzAtYsn+UjmtBadUIq2di 8hPGv4o9bxbp5MqZ04j6aR/23brOsW+EEocymKK6+0QhCxey3aja+RkhKl69amqQ6N XJdi5zyMKAqppaUJ6G4ecPg8GqnSeTsGO9qzzWCt9GSUfWZ40AnxGOyq9GOroS7GxS SNxpkYmSk5FPg== Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id DB673443B3E; Sun, 1 Dec 2024 18:51:22 -0500 (EST) Original-Received: from alfajor (104-195-225-43.cpe.teksavvy.com [104.195.225.43]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id A77F1120198; Sun, 1 Dec 2024 18:51:22 -0500 (EST) In-Reply-To: <86bjxx817w.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 30 Nov 2024 12:28:35 +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:296289 Archived-At: >> # keybinding >> would be nice to provide default keybinding for smerge-swap: C-c ^ s Interesting. I've never found a use for that command, personally. Could you give some hint for the situations where you found it handy? >> # smerge-extend >> Helpful when user intent to keep both. Sorry: to keep both what? >> (defun smerge-extend () >> "Copy the line directly following the conflict into both upper and lower sections. Hmm... Why just one line and why only from the end? [ IOW, here as well, I'm curious what is the kind of scenario where you use that command. ] >> This is useful when both versions need to share some common code that follows the conflict." Hmm... my conflicts have usually 3 sections, so "both" isn't right. [ Unless you specifically chose 2-way conflicts, I recommend you investigate how to get 3-way conflicts, because they give a lot more information and allow for example `smerge-resolve` to "just work" in more cases. YMMV, but personally whenever I'm faced with a 2-way conflict, I'm frustrated. ] Stefan