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 16:35:57 +0100 Message-ID: References: <865xykr79f.fsf@gnu.org> <4eed07a3-1df5-48f9-be9a-1655721118f1@gutov.dev> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11323"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Eli Zaretskii , Stefan Monnier , 69220@debbugs.gnu.org, Konstantin Kharlamov To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Feb 19 16:36:54 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 1rc5hM-0002fW-Ch for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 19 Feb 2024 16:36:52 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rc5hC-0005pH-Vb; Mon, 19 Feb 2024 10:36: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 1rc5hB-0005oj-3c for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 10:36: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 1rc5hA-0007sr-RL for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 10:36:40 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rc5hV-0006PJ-Tm for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 10:37:01 -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 15:37: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.170835702024622 (code B ref 69220); Mon, 19 Feb 2024 15:37:01 +0000 Original-Received: (at 69220) by debbugs.gnu.org; 19 Feb 2024 15:37:00 +0000 Original-Received: from localhost ([127.0.0.1]:43203 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc5hS-0006P1-Vy for submit@debbugs.gnu.org; Mon, 19 Feb 2024 10:37:00 -0500 Original-Received: from smtp-out2.suse.de ([195.135.223.131]:42946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc5hO-0006Og-JO for 69220@debbugs.gnu.org; Mon, 19 Feb 2024 10:36:58 -0500 Original-Received: from hawking.nue2.suse.org (unknown [10.168.4.11]) by smtp-out2.suse.de (Postfix) with ESMTP id 34D7B1FD15; Mon, 19 Feb 2024 15:35:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1708356957; 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=xeAN+41bWyzQzrDwMkIoCHTvoMrGX8UFyjRSvwVmGDY=; b=gLCH6OupmuFT3qzSfImhW2cYn32nGs5My//iSF3PvMJxIYZztHLeDaxxoXoLOSLoLXQQDk 5L4cizA4Ln7kqonL3gAMJggp5+6yFAmloZZxBoBmrS7J5nb7EE8ohRELBDWpUnHoe7oU6U 5IQWCR/idr2W0r53+NDUGHls2msUyWY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1708356957; 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=xeAN+41bWyzQzrDwMkIoCHTvoMrGX8UFyjRSvwVmGDY=; b=Ya0zPrXsV1YXtkv1AoH17bg7rNiewNXn4RefptchTuLuM4veYMRrPGYI8UTW9fv+t5rb68 9pE73RoNInajPUCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1708356957; 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=xeAN+41bWyzQzrDwMkIoCHTvoMrGX8UFyjRSvwVmGDY=; b=gLCH6OupmuFT3qzSfImhW2cYn32nGs5My//iSF3PvMJxIYZztHLeDaxxoXoLOSLoLXQQDk 5L4cizA4Ln7kqonL3gAMJggp5+6yFAmloZZxBoBmrS7J5nb7EE8ohRELBDWpUnHoe7oU6U 5IQWCR/idr2W0r53+NDUGHls2msUyWY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1708356957; 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=xeAN+41bWyzQzrDwMkIoCHTvoMrGX8UFyjRSvwVmGDY=; b=Ya0zPrXsV1YXtkv1AoH17bg7rNiewNXn4RefptchTuLuM4veYMRrPGYI8UTW9fv+t5rb68 9pE73RoNInajPUCg== Original-Received: by hawking.nue2.suse.org (Postfix, from userid 17005) id 2689F4A0389; Mon, 19 Feb 2024 16:35:57 +0100 (CET) In-Reply-To: <4eed07a3-1df5-48f9-be9a-1655721118f1@gutov.dev> (Dmitry Gutov's message of "Mon, 19 Feb 2024 17:20:45 +0200") X-Yow: ONE: I will donate my entire ``BABY HUEY'' comic book collection to the downtown PLASMA CENTER.. TWO: I won't START a BAND called ``KHADAFY & THE HIT SQUAD''.. THREE: I won't ever TUMBLE DRY my FOX TERRIER again!! Authentication-Results: smtp-out2.suse.de; none X-Spamd-Result: default: False [-0.72 / 50.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_ENVRCPT(0.00)[yandex.ru]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_FIVE(0.00)[5]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_CC(0.00)[gnu.org,yandex.ru,iro.umontreal.ca,debbugs.gnu.org]; MID_RHS_MATCH_FROM(0.00)[]; BAYES_HAM(-0.62)[82.06%] 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:280271 Archived-At: On Feb 19 2024, Dmitry Gutov wrote: > Like Andreas described, doing a merge using an "ours" or "theirs" strategy > is something that people do on occasion. I did not talk about the ours stategy (and there is no theirs strategy), only about the ours and theirs option of the ort and recursive strategy. The difference is that the ours strategy completely throws away the other side of the merge, whereas the ours/theirs options of the ort/recursive strategies control only how conflicts are handled. -- 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."