From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Andreas Schwab 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 13:25:11 +0100 Message-ID: References: <865xykr79f.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24026"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Eli Zaretskii , Stefan Monnier , 69220@debbugs.gnu.org To: Konstantin Kharlamov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Feb 19 13:26:19 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 1rc2ix-00060n-KS for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 19 Feb 2024 13:26:19 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rc2iQ-0005Gi-BE; Mon, 19 Feb 2024 07:25:46 -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 1rc2iM-0005Fg-Q2 for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 07:25:43 -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 1rc2iM-0003SN-Hy for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 07:25:42 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rc2ig-0006jH-Bn for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 07:26:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Andreas Schwab Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 19 Feb 2024 12:26: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.170834554125840 (code B ref 69220); Mon, 19 Feb 2024 12:26:02 +0000 Original-Received: (at 69220) by debbugs.gnu.org; 19 Feb 2024 12:25:41 +0000 Original-Received: from localhost ([127.0.0.1]:40549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc2iL-0006ii-5j for submit@debbugs.gnu.org; Mon, 19 Feb 2024 07:25:41 -0500 Original-Received: from smtp-out1.suse.de ([195.135.223.130]:40222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc2iI-0006iT-BM for 69220@debbugs.gnu.org; Mon, 19 Feb 2024 07:25:40 -0500 Original-Received: from hawking.nue2.suse.org (unknown [10.168.4.11]) by smtp-out1.suse.de (Postfix) with ESMTP id 45B5F21E76; Mon, 19 Feb 2024 12:25:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1708345511; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=HUlD9NJFDVUqVJYIr4TLgJs+14OAksUIM1owTQQDfnQ=; b=K2IZz0xMb+ik4mojN++UYjJrdy8RrZjpopplJGclUMEgu/I6yHuHFvTrsRpaBFd5xWlMPh WybrEGp06cemRD9rZU2+btpzIbABv+rsuIGI/N5HNy0yAoL0xkvOgjT73ko6rGhF0i1Uhd bHcS1U4AXNhOH7hmlqAuiq8X/3hZimQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1708345511; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=HUlD9NJFDVUqVJYIr4TLgJs+14OAksUIM1owTQQDfnQ=; b=ojnUj3B9MJCSkr/gRQ+EJ/36lszen21A1P+gH5Ih0gcq7nYFXfQKvJOxXnj+w93IpxkIqu xjb7yZM7RMxhCPCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1708345511; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=HUlD9NJFDVUqVJYIr4TLgJs+14OAksUIM1owTQQDfnQ=; b=K2IZz0xMb+ik4mojN++UYjJrdy8RrZjpopplJGclUMEgu/I6yHuHFvTrsRpaBFd5xWlMPh WybrEGp06cemRD9rZU2+btpzIbABv+rsuIGI/N5HNy0yAoL0xkvOgjT73ko6rGhF0i1Uhd bHcS1U4AXNhOH7hmlqAuiq8X/3hZimQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1708345511; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=HUlD9NJFDVUqVJYIr4TLgJs+14OAksUIM1owTQQDfnQ=; b=ojnUj3B9MJCSkr/gRQ+EJ/36lszen21A1P+gH5Ih0gcq7nYFXfQKvJOxXnj+w93IpxkIqu xjb7yZM7RMxhCPCw== Original-Received: by hawking.nue2.suse.org (Postfix, from userid 17005) id 3A5C84A0389; Mon, 19 Feb 2024 13:25:11 +0100 (CET) In-Reply-To: (Konstantin Kharlamov's message of "Mon, 19 Feb 2024 15:17:55 +0300") X-Yow: Will it improve my CASH FLOW? Authentication-Results: smtp-out1.suse.de; none X-Spamd-Result: default: False [-0.50 / 50.00]; ARC_NA(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FREEMAIL_ENVRCPT(0.00)[yandex.ru]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_SOME(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email]; FREEMAIL_TO(0.00)[yandex.ru]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; BAYES_HAM(-0.40)[77.81%] 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:280250 Archived-At: On Feb 19 2024, Konstantin Kharlamov wrote: > 1: Actually, git provides a functional that should work for that > usecase; but in my experience it is more confusing than it's useful. It > is options `--theirs/ours`, i.e. `git checkout --theirs ./` and `git > checkout --ours ./`. But these options are problematic because instead > of resolving conflict in preference of `theirs` or `ours` they do a > complete checkout of the code from either of the branches. I can't > count how many times I was burned by trying to resolve conflicts with > these options and then was getting wrong code because together with the > conflicting part the options change everything else. I think what you actually want is the 'ours'/'theirs' options of the merge strategy (available to both the ort and recursive strategies). -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."