Received: (at 69220) by debbugs.gnu.org; 19 Feb 2024 12:54:32 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Feb 19 07:54:32 2024 Received: from localhost ([127.0.0.1]:40658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rc3AE-0004c0-L1 for submit <at> debbugs.gnu.org; Mon, 19 Feb 2024 07:54:32 -0500 Received: from forward502c.mail.yandex.net ([178.154.239.210]:52846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <Hi-Angel@HIDDEN>) id 1rc3AA-0004bm-1F for 69220 <at> debbugs.gnu.org; Mon, 19 Feb 2024 07:54:29 -0500 Received: from mail-nwsmtp-smtp-production-main-19.sas.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-19.sas.yp-c.yandex.net [IPv6:2a02:6b8:c24:5a6:0:640:ee22:0]) by forward502c.mail.yandex.net (Yandex) with ESMTPS id C6B7C60CE9; Mon, 19 Feb 2024 15:53:32 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-19.sas.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id UrPHWpB5N0U0-HRKhio7P; Mon, 19 Feb 2024 15:53:32 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1708347212; bh=70kegglWugKxc00pkAKoAc1qle2H0te4VIPF/w/X4tc=; h=References:Date:In-Reply-To:Cc:To:From:Subject:Message-ID; b=OMBEqibXorLnBHk89amzPME2WoEeL+nJXlHEWQ9rt0QObzX8+yCryHK4ehma64YYB RCuSBK/bpduBA8E+Ckc1e/wpqy85/11RSVcwIPpFpaBXtAj6Gg2G122XieLUILcY25 EL6Ebzw20NOzEMGwPRzR4kaDpy70giw+9LSDAGuk= Authentication-Results: mail-nwsmtp-smtp-production-main-19.sas.yp-c.yandex.net; dkim=pass header.i=@yandex.ru Message-ID: <3beba6eff9e1a4c74b470737ed299106fe5538ab.camel@HIDDEN> Subject: Re: bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file From: Konstantin Kharlamov <Hi-Angel@HIDDEN> To: Andreas Schwab <schwab@HIDDEN> Date: Mon, 19 Feb 2024 15:53:30 +0300 In-Reply-To: <mvmedd8y66f.fsf@HIDDEN> References: <d3c423c7b2ced498ff6c1b23e1e67926410d4bf0.camel@HIDDEN> <865xykr79f.fsf@HIDDEN> <de2c91108f8ee51278b924fe1437b3622f5aae21.camel@HIDDEN> <mvmmsrwy72w.fsf@HIDDEN> <0f2cffca61b65ef7c0bd65e3029068d05d64b513.camel@HIDDEN> <mvmil2ky6pl.fsf@HIDDEN> <bf3b48721501fbe29cac687ba19576869c6c630a.camel@HIDDEN> <mvmedd8y66f.fsf@HIDDEN> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.50.3 MIME-Version: 1.0 X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 69220 Cc: Eli Zaretskii <eliz@HIDDEN>, Stefan Monnier <monnier@HIDDEN>, 69220 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.9 (--) On Mon, 2024-02-19 at 13:44 +0100, Andreas Schwab wrote: > On Feb 19 2024, Konstantin Kharlamov wrote: >=20 > > So, I just created an artificial conflict. Then I get these errors: > >=20 > > =C2=A0=C2=A0=C2=A0 =CE=BB git merge -X theirs > > =C2=A0=C2=A0=C2=A0 error: Merging is not possible because you have unme= rged files. >=20 > You need to pass it when you start the merge/rebase. Oh, I see=E2=80=A6 Well, thank you, good to know it's there. Although that = does limit the application of these options, not sure I'll be using them too often=E2=80=A6 Because you need to plan beforehand that you'll get a confli= ct which you'll want to resolve in preference of theirs or ours. And AFAIK ours/theirs may be swapped between different commands (I don't remember which, maybe cherry-pick, but I'm not sure), so that leaves a margin for mistakes with the cost of digging into git-reflog to get the older version of the branch and then re-apply changes anew. So=E2=80=A6 I guess I= 'll prefer Emacs's smerge functional for resolving conflicts, it's just more reliable.
bug-gnu-emacs@HIDDEN:bug#69220; Package emacs.
Full text available.Received: (at 69220) by debbugs.gnu.org; 19 Feb 2024 12:46:13 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Feb 19 07:46:13 2024 Received: from localhost ([127.0.0.1]:40617 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rc32B-0004IO-Ox for submit <at> debbugs.gnu.org; Mon, 19 Feb 2024 07:46:13 -0500 Received: from smtp-out2.suse.de ([195.135.223.131]:59618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <schwab@HIDDEN>) id 1rc329-0004Dt-NB for 69220 <at> debbugs.gnu.org; Mon, 19 Feb 2024 07:46:11 -0500 Received: from hawking.nue2.suse.org (unknown [10.168.4.11]) by smtp-out2.suse.de (Postfix) with ESMTP id E19E81F7F7; Mon, 19 Feb 2024 12:45:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1708346712; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UM0EBW2E/7rtqxo85W11tVafNf2HLvB4oqkFVRtM7kI=; b=hXWTmcae9ucqtHWWbCG7TBWhjnapVwBD5GiEGY5iyIBinEKO0+T8lY0WkfWoypBpEoXoE5 DdbHKCE7HtHLqb1xFYk4ujabsJeMcRmv8R7vAPuuaoTiSU66KNFCllVmBRmHjQxvkCAPcl ZWT2zK5rslkRZoo2vCi1KNIMKiHcGIY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1708346712; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UM0EBW2E/7rtqxo85W11tVafNf2HLvB4oqkFVRtM7kI=; b=cLbWOYJS1PjQ+uyQcoefSKyQ0Vi1WnpeMemtV3VzhYtDG9QOXfB4bIZw2GJ0NQO2EOwIn+ ia3/ggGk3iuLY6Ag== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1708346710; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UM0EBW2E/7rtqxo85W11tVafNf2HLvB4oqkFVRtM7kI=; b=cxwr7Q04bNx/ytN/0D8b9ms5ngWOQzEog8sCO5Tq2XO5XqdtV4hOrrc5N1D71sJ2VU6USW TLCsqyk+lup3ISwYNV/LVuQ4DFLS/c6eDbrAZXAA/63KjkOii12pzN3qKQ8P0/V0nd1oT5 UcUXXojNoI8qCveXW6lAn2aZfxfbUCU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1708346710; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UM0EBW2E/7rtqxo85W11tVafNf2HLvB4oqkFVRtM7kI=; b=YwuEsomNZbuUU6re3XUoomPLYgg6B5EaKyXpogFgmle0xGaKTAB2Y6M35Da8xkxuwAzBRL NbrVWnLXaWJZHhAg== Received: by hawking.nue2.suse.org (Postfix, from userid 17005) id CA7914A0389; Mon, 19 Feb 2024 13:44:40 +0100 (CET) From: Andreas Schwab <schwab@HIDDEN> To: Konstantin Kharlamov <Hi-Angel@HIDDEN> Subject: Re: bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file In-Reply-To: <bf3b48721501fbe29cac687ba19576869c6c630a.camel@HIDDEN> (Konstantin Kharlamov's message of "Mon, 19 Feb 2024 15:38:51 +0300") References: <d3c423c7b2ced498ff6c1b23e1e67926410d4bf0.camel@HIDDEN> <865xykr79f.fsf@HIDDEN> <de2c91108f8ee51278b924fe1437b3622f5aae21.camel@HIDDEN> <mvmmsrwy72w.fsf@HIDDEN> <0f2cffca61b65ef7c0bd65e3029068d05d64b513.camel@HIDDEN> <mvmil2ky6pl.fsf@HIDDEN> <bf3b48721501fbe29cac687ba19576869c6c630a.camel@HIDDEN> X-Yow: Alright, you!! Imitate a WOUNDED SEAL pleading for a PARKING SPACE!! Date: Mon, 19 Feb 2024 13:44:40 +0100 Message-ID: <mvmedd8y66f.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Authentication-Results: smtp-out2.suse.de; none X-Spam-Level: X-Spam-Score: -2.56 X-Spamd-Result: default: False [-2.56 / 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]; NEURAL_HAM_LONG(-1.00)[-1.000]; TO_DN_SOME(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.06)[-0.294]; 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(-1.40)[90.94%] X-Spam-Flag: NO X-Spam-Score: -4.2 (----) X-Debbugs-Envelope-To: 69220 Cc: Eli Zaretskii <eliz@HIDDEN>, Stefan Monnier <monnier@HIDDEN>, 69220 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -5.2 (-----) On Feb 19 2024, Konstantin Kharlamov wrote: > So, I just created an artificial conflict. Then I get these errors: > > λ git merge -X theirs > error: Merging is not possible because you have unmerged files. You need to pass it when you start the merge/rebase. -- Andreas Schwab, SUSE Labs, schwab@HIDDEN GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."
bug-gnu-emacs@HIDDEN:bug#69220; Package emacs.
Full text available.
Received: (at 69220) by debbugs.gnu.org; 19 Feb 2024 12:39:21 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Feb 19 07:39:21 2024
Received: from localhost ([127.0.0.1]:40599 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rc2vY-0001Ny-OR
for submit <at> debbugs.gnu.org; Mon, 19 Feb 2024 07:39:21 -0500
Received: from forward502b.mail.yandex.net ([178.154.239.146]:42664)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Hi-Angel@HIDDEN>) id 1rc2vV-0001No-E7
for 69220 <at> debbugs.gnu.org; Mon, 19 Feb 2024 07:39:19 -0500
Received: from mail-nwsmtp-smtp-production-main-24.iva.yp-c.yandex.net
(mail-nwsmtp-smtp-production-main-24.iva.yp-c.yandex.net
[IPv6:2a02:6b8:c0c:c022:0:640:bf6e:0])
by forward502b.mail.yandex.net (Yandex) with ESMTPS id 1E1E55EB92;
Mon, 19 Feb 2024 15:38:54 +0300 (MSK)
Received: by mail-nwsmtp-smtp-production-main-24.iva.yp-c.yandex.net
(smtp/Yandex) with ESMTPSA id qcPItwDOkGk0-SrM3JEIe;
Mon, 19 Feb 2024 15:38:53 +0300
X-Yandex-Fwd: 1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail;
t=1708346333; bh=hOwmQDu2il+5ZcWGj2jQpYe6T5JTxuiPm2WOHmAjrV4=;
h=References:Date:In-Reply-To:Cc:To:From:Subject:Message-ID;
b=hPLIbSkXPtd4bM3FKqMo3jow/Q7dtYB5Q7q1C7vCUcodS3pdN77EI0NYC4bu4rtd2
NNfn7lIJhYPcPKkG2uf48EZpB2nUbF/noMtwt22Tc2gy2YqfQNz9ozs0hPy85kNBBf
W2vT8p5hHrcCf7kDiC9OlV8S5JBOnS5f8wfjv0aM=
Authentication-Results: mail-nwsmtp-smtp-production-main-24.iva.yp-c.yandex.net;
dkim=pass header.i=@yandex.ru
Message-ID: <bf3b48721501fbe29cac687ba19576869c6c630a.camel@HIDDEN>
Subject: Re: bug#69220: [PATCH] smerge-mode: add a function to resolve all
conflicts in a file
From: Konstantin Kharlamov <Hi-Angel@HIDDEN>
To: Andreas Schwab <schwab@HIDDEN>
Date: Mon, 19 Feb 2024 15:38:51 +0300
In-Reply-To: <mvmil2ky6pl.fsf@HIDDEN>
References: <d3c423c7b2ced498ff6c1b23e1e67926410d4bf0.camel@HIDDEN>
<865xykr79f.fsf@HIDDEN>
<de2c91108f8ee51278b924fe1437b3622f5aae21.camel@HIDDEN>
<mvmmsrwy72w.fsf@HIDDEN>
<0f2cffca61b65ef7c0bd65e3029068d05d64b513.camel@HIDDEN>
<mvmil2ky6pl.fsf@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.50.3
MIME-Version: 1.0
X-Spam-Score: -1.9 (-)
X-Debbugs-Envelope-To: 69220
Cc: Eli Zaretskii <eliz@HIDDEN>, Stefan Monnier <monnier@HIDDEN>,
69220 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.9 (--)
On Mon, 2024-02-19 at 13:33 +0100, Andreas Schwab wrote:
> On Feb 19 2024, Konstantin Kharlamov wrote:
>
> > On Mon, 2024-02-19 at 13:25 +0100, Andreas Schwab wrote:
> > > 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).
> >
> > Oh, thanks for mentioning, I didn't know! So=E2=80=A6 how do I use them=
?
>
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 -X <strategy-option>, --strategy-opt=
ion=3D<strategy-option>
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Pass the <st=
rategy-option> through to the merge strategy.
> This
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 implies --me=
rge and, if no strategy has been specified, -s
> ort.
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Note the rev=
ersal of ours and theirs as noted above for
> the -m
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 option.
>
Sorry, I'm not following.
So, I just created an artificial conflict. Then I get these errors:
=CE=BB git merge -X theirs
error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
=CE=BB git add -u
=CE=BB git merge -X theirs
fatal: No current branch.
bug-gnu-emacs@HIDDEN:bug#69220; Package emacs.
Full text available.
Received: (at 69220) by debbugs.gnu.org; 19 Feb 2024 12:34:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Feb 19 07:34:10 2024
Received: from localhost ([127.0.0.1]:40574 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rc2qX-0001Ei-Nl
for submit <at> debbugs.gnu.org; Mon, 19 Feb 2024 07:34:10 -0500
Received: from smtp-out1.suse.de ([195.135.223.130]:38036)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <schwab@HIDDEN>) id 1rc2qV-0001E9-Kb
for 69220 <at> debbugs.gnu.org; Mon, 19 Feb 2024 07:34:08 -0500
Received: from hawking.nue2.suse.org (unknown [10.168.4.11])
by smtp-out1.suse.de (Postfix) with ESMTP id 7688422201;
Mon, 19 Feb 2024 12:33:10 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa;
t=1708345990; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:
mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=4ioMtn5Jr0juetckYVwavKVvMz6HgdRdFkZnScCzC8o=;
b=eRu5Ej2mueGznPcQlOqtFe8s4M5x5Jgma3pMUtoO8sETHPfcxqFFBQsm7sSlo6ZHYMNdYe
eXzze+DxUQKlm3qtSJXDp+K+wS18JzOydr7fIYRFSkHyTK8k2BOQ7ulb9hjK1HQNxK/TVi
XQHQyXE2WIidbwC3lDmGIIcd5/PwUl4=
DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;
s=susede2_ed25519; t=1708345990;
h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:
mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=4ioMtn5Jr0juetckYVwavKVvMz6HgdRdFkZnScCzC8o=;
b=y8aqJqYxwNkbZAviOf6FXC2zH0XiNZGzpe83AAYFRBupmp8kmtyrq2uFAvDx07ZZIJ4ruo
KXWBSoV/8MMt9rBQ==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa;
t=1708345990; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:
mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=4ioMtn5Jr0juetckYVwavKVvMz6HgdRdFkZnScCzC8o=;
b=eRu5Ej2mueGznPcQlOqtFe8s4M5x5Jgma3pMUtoO8sETHPfcxqFFBQsm7sSlo6ZHYMNdYe
eXzze+DxUQKlm3qtSJXDp+K+wS18JzOydr7fIYRFSkHyTK8k2BOQ7ulb9hjK1HQNxK/TVi
XQHQyXE2WIidbwC3lDmGIIcd5/PwUl4=
DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;
s=susede2_ed25519; t=1708345990;
h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:
mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=4ioMtn5Jr0juetckYVwavKVvMz6HgdRdFkZnScCzC8o=;
b=y8aqJqYxwNkbZAviOf6FXC2zH0XiNZGzpe83AAYFRBupmp8kmtyrq2uFAvDx07ZZIJ4ruo
KXWBSoV/8MMt9rBQ==
Received: by hawking.nue2.suse.org (Postfix, from userid 17005)
id 6BC6F4A0389; Mon, 19 Feb 2024 13:33:10 +0100 (CET)
From: Andreas Schwab <schwab@HIDDEN>
To: Konstantin Kharlamov <Hi-Angel@HIDDEN>
Subject: Re: bug#69220: [PATCH] smerge-mode: add a function to resolve all
conflicts in a file
In-Reply-To: <0f2cffca61b65ef7c0bd65e3029068d05d64b513.camel@HIDDEN>
(Konstantin Kharlamov's message of "Mon, 19 Feb 2024 15:28:50 +0300")
References: <d3c423c7b2ced498ff6c1b23e1e67926410d4bf0.camel@HIDDEN>
<865xykr79f.fsf@HIDDEN>
<de2c91108f8ee51278b924fe1437b3622f5aae21.camel@HIDDEN>
<mvmmsrwy72w.fsf@HIDDEN>
<0f2cffca61b65ef7c0bd65e3029068d05d64b513.camel@HIDDEN>
X-Yow: I'm continually AMAZED at th'breathtaking effects of WIND EROSION!!
Date: Mon, 19 Feb 2024 13:33:10 +0100
Message-ID: <mvmil2ky6pl.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Authentication-Results: smtp-out1.suse.de;
none
X-Spamd-Result: default: False [-0.12 / 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.02)[52.43%]
X-Spam-Level:
X-Spam-Flag: NO
X-Spam-Score: -0.12
X-Spam-Score: -4.2 (----)
X-Debbugs-Envelope-To: 69220
Cc: Eli Zaretskii <eliz@HIDDEN>, Stefan Monnier <monnier@HIDDEN>,
69220 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -5.2 (-----)
On Feb 19 2024, Konstantin Kharlamov wrote:
> On Mon, 2024-02-19 at 13:25 +0100, Andreas Schwab wrote:
>> 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).
>
> Oh, thanks for mentioning, I didn't know! So… how do I use them?
-X <strategy-option>, --strategy-option=<strategy-option>
Pass the <strategy-option> through to the merge strategy. This
implies --merge and, if no strategy has been specified, -s ort.
Note the reversal of ours and theirs as noted above for the -m
option.
--
Andreas Schwab, SUSE Labs, schwab@HIDDEN
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
bug-gnu-emacs@HIDDEN:bug#69220; Package emacs.
Full text available.Received: (at 69220) by debbugs.gnu.org; 19 Feb 2024 12:29:49 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Feb 19 07:29:49 2024 Received: from localhost ([127.0.0.1]:40558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rc2mL-0006oV-8z for submit <at> debbugs.gnu.org; Mon, 19 Feb 2024 07:29:49 -0500 Received: from forward500c.mail.yandex.net ([178.154.239.208]:54246) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <Hi-Angel@HIDDEN>) id 1rc2mH-0006oF-Ju for 69220 <at> debbugs.gnu.org; Mon, 19 Feb 2024 07:29:47 -0500 Received: from mail-nwsmtp-smtp-production-main-90.myt.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-90.myt.yp-c.yandex.net [IPv6:2a02:6b8:c12:2502:0:640:9ff9:0]) by forward500c.mail.yandex.net (Yandex) with ESMTPS id 567E760B5D; Mon, 19 Feb 2024 15:28:52 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-90.myt.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id oSP85O9h0eA0-UloGlq0M; Mon, 19 Feb 2024 15:28:51 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1708345731; bh=xTESqkGUg912TKqAj+TeYDCqpkhuo2QxIoo1elGFcCc=; h=References:Date:In-Reply-To:Cc:To:From:Subject:Message-ID; b=Ho4A4BX6A/Hb++yHQZmpMPK1xP6LkFlok/R5Kb7jqITnVJ4F7sxkcRlEMnjZ0OIht 70nmPP1hnpoLLAun+m1ygpz4eYeXdjpPDPzDVDYtozSrFoA3y0w0OqJpNoI78YSCY8 Wb/bEUWZujMrn6LivIER/Xgpkx12vE/ixIunBhb0= Authentication-Results: mail-nwsmtp-smtp-production-main-90.myt.yp-c.yandex.net; dkim=pass header.i=@yandex.ru Message-ID: <0f2cffca61b65ef7c0bd65e3029068d05d64b513.camel@HIDDEN> Subject: Re: bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file From: Konstantin Kharlamov <Hi-Angel@HIDDEN> To: Andreas Schwab <schwab@HIDDEN> Date: Mon, 19 Feb 2024 15:28:50 +0300 In-Reply-To: <mvmmsrwy72w.fsf@HIDDEN> References: <d3c423c7b2ced498ff6c1b23e1e67926410d4bf0.camel@HIDDEN> <865xykr79f.fsf@HIDDEN> <de2c91108f8ee51278b924fe1437b3622f5aae21.camel@HIDDEN> <mvmmsrwy72w.fsf@HIDDEN> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.50.3 MIME-Version: 1.0 X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 69220 Cc: Eli Zaretskii <eliz@HIDDEN>, Stefan Monnier <monnier@HIDDEN>, 69220 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.9 (--) On Mon, 2024-02-19 at 13:25 +0100, Andreas Schwab wrote: > On Feb 19 2024, Konstantin Kharlamov wrote: >=20 > > 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. >=20 > I think what you actually want is the 'ours'/'theirs' options of the > merge strategy (available to both the ort and recursive strategies). Oh, thanks for mentioning, I didn't know! So=E2=80=A6 how do I use them? So, a usual workflow: 1. `git rebase -i HEAD~4` 2. do some edits 3. `git add -u && git rebase --continue` *boom* I get conflicts and I want them to be solved in preference "theirs". What command do I call here?
bug-gnu-emacs@HIDDEN:bug#69220; Package emacs.
Full text available.Received: (at 69220) by debbugs.gnu.org; 19 Feb 2024 12:25:41 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Feb 19 07:25:41 2024 Received: from localhost ([127.0.0.1]:40549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rc2iL-0006ii-5j for submit <at> debbugs.gnu.org; Mon, 19 Feb 2024 07:25:41 -0500 Received: from smtp-out1.suse.de ([195.135.223.130]:40222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <schwab@HIDDEN>) id 1rc2iI-0006iT-BM for 69220 <at> debbugs.gnu.org; Mon, 19 Feb 2024 07:25:40 -0500 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== Received: by hawking.nue2.suse.org (Postfix, from userid 17005) id 3A5C84A0389; Mon, 19 Feb 2024 13:25:11 +0100 (CET) From: Andreas Schwab <schwab@HIDDEN> To: Konstantin Kharlamov <Hi-Angel@HIDDEN> Subject: Re: bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file In-Reply-To: <de2c91108f8ee51278b924fe1437b3622f5aae21.camel@HIDDEN> (Konstantin Kharlamov's message of "Mon, 19 Feb 2024 15:17:55 +0300") References: <d3c423c7b2ced498ff6c1b23e1e67926410d4bf0.camel@HIDDEN> <865xykr79f.fsf@HIDDEN> <de2c91108f8ee51278b924fe1437b3622f5aae21.camel@HIDDEN> X-Yow: Will it improve my CASH FLOW? Date: Mon, 19 Feb 2024 13:25:11 +0100 Message-ID: <mvmmsrwy72w.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain 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-Spam-Level: X-Spam-Flag: NO X-Spam-Score: -0.50 X-Spam-Score: -4.2 (----) X-Debbugs-Envelope-To: 69220 Cc: Eli Zaretskii <eliz@HIDDEN>, Stefan Monnier <monnier@HIDDEN>, 69220 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -5.2 (-----) 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@HIDDEN GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."
bug-gnu-emacs@HIDDEN:bug#69220; Package emacs.
Full text available.Received: (at 69220) by debbugs.gnu.org; 19 Feb 2024 12:18:56 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Feb 19 07:18:56 2024 Received: from localhost ([127.0.0.1]:40530 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rc2bo-0006XQ-8q for submit <at> debbugs.gnu.org; Mon, 19 Feb 2024 07:18:56 -0500 Received: from forward500a.mail.yandex.net ([178.154.239.80]:56808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <Hi-Angel@HIDDEN>) id 1rc2bi-0006XE-Me for 69220 <at> debbugs.gnu.org; Mon, 19 Feb 2024 07:18:55 -0500 Received: from mail-nwsmtp-smtp-production-main-69.iva.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-69.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:5402:0:640:2835:0]) by forward500a.mail.yandex.net (Yandex) with ESMTPS id 8E2FA60F8D; Mon, 19 Feb 2024 15:17:57 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-69.iva.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id tHPMJDuuBOs0-RTlr2oyO; Mon, 19 Feb 2024 15:17:57 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1708345077; bh=FS+m1i+qAh6k0EG2V4d+mzNAWklibjX5p4c4V4Se+GQ=; h=References:Date:In-Reply-To:Cc:To:From:Subject:Message-ID; b=aHZ3dVwCbhMNN/mQ/o6klzihd3uiFaFq7hLrZBatDaM6qvBocTbc/eOB8V+4/UUDp KyywzyFO8LHCoLSrguOQ7Lg+xAD/YFFIRiXQ3G/J+J5mLX62Uj9u5ZVW1L/bwMrqn6 VqVUU1gmYVZPJCLn1VKDxSpycd0p4CYUo6EtIV/o= Authentication-Results: mail-nwsmtp-smtp-production-main-69.iva.yp-c.yandex.net; dkim=pass header.i=@yandex.ru Message-ID: <de2c91108f8ee51278b924fe1437b3622f5aae21.camel@HIDDEN> Subject: Re: bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file From: Konstantin Kharlamov <Hi-Angel@HIDDEN> To: Eli Zaretskii <eliz@HIDDEN>, Stefan Monnier <monnier@HIDDEN> Date: Mon, 19 Feb 2024 15:17:55 +0300 In-Reply-To: <865xykr79f.fsf@HIDDEN> References: <d3c423c7b2ced498ff6c1b23e1e67926410d4bf0.camel@HIDDEN> <865xykr79f.fsf@HIDDEN> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.50.3 MIME-Version: 1.0 X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 69220 Cc: 69220 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.9 (--) On Mon, 2024-02-19 at 14:03 +0200, Eli Zaretskii wrote: > > From: Konstantin Kharlamov <Hi-Angel@HIDDEN> > > Date: Sat, 17 Feb 2024 13:16:14 +0300 > >=20 > > This implements a feature request from here=C2=B9 about having a > > function to > > resolve all conflicts simultaneously. Although question author > > didn't > > reply, but either way I think it's a useful functional. I needed it > > so > > many times, but before stumbling upon this question I just didn't > > know > > there are functions `smerge-keep-upper/base/lower`, and so ofc I > > never > > though of writing a new one that would apply them to all conflicts. >=20 > 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. Well, in Emacs it is allowed to create large commits with many functional changes, which I think is why you never saw such functional to be necessary. Offhand I can tell at least two situations where it is needed; both imply you have more than one commit on the branch: 1. You got a commit that does two different functional changes to a hunk. So you want to split it. You do an interactive rebase to the previous commit, then do one of the changes and create a commit from it. Then you do a `git rebase --continue` and you get conflicts; but you know beforehand exactly that you want it to be solved in preference of the newer commit.=C2=B9 2. You noted, either yourself or as part of codereview, that one of the older commits on the branch has a bug; but you know the bug is non- existent in newer commits. So you fix it in the older commit, then upon `git rebase --continue` you again know exactly that you want just the newer version.=C2=B9 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'm also guessing one could have the same effect by giving a prefix > argument of suitable value to the conflict-resolution command. >=20 > Having said that, if this is deemed useful, why not?=C2=A0 Adding Stefan > to > the discussion, in case he has comments.=C2=A0 I'd also be interested in > Dmitry's opinions. >=20 > Thanks.
bug-gnu-emacs@HIDDEN:bug#69220; Package emacs.
Full text available.Received: (at 69220) by debbugs.gnu.org; 19 Feb 2024 12:03:44 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Feb 19 07:03:44 2024 Received: from localhost ([127.0.0.1]:40510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rc2N5-0006BQ-Uw for submit <at> debbugs.gnu.org; Mon, 19 Feb 2024 07:03:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <eliz@HIDDEN>) id 1rc2N0-0006BB-AH for 69220 <at> debbugs.gnu.org; Mon, 19 Feb 2024 07:03:42 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <eliz@HIDDEN>) id 1rc2MZ-0006In-LO; Mon, 19 Feb 2024 07:03:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=IFZFqWZpx3qI3GZrfIhru/jfTNeVrcGXANhYeBuF2Ns=; b=Nz8q73ytFT84mI7qnZIO C44teK4z8LjqvBmbjBenQIPMugv6Vd011Tq9JguMlYxwI+raN/lxniODQWaIXL554D0deice4Is3Y dkJ7gGUckhBPm1TFIFqMQPsDGygtSlh9a3e1WQGOleun8kTOqxQh9rVrhBfoW4K6eKVS1zOKCKsoE taviHYVEZtTNrOID9YwaEihkbMGIsZ3XmPpTXwCuqpjPW6V56fSsbD9gHggm3wIt5VejEl4yiom7D N0dfvbdH4V2BkH1UJZWB7qVzPzpRM1AQ6EOs69ETjSq7DK52xjTBOz5XPz5hozYcvnC20KmhYklFg uIG0N9LjU01RMg==; Date: Mon, 19 Feb 2024 14:03:08 +0200 Message-Id: <865xykr79f.fsf@HIDDEN> From: Eli Zaretskii <eliz@HIDDEN> To: Konstantin Kharlamov <Hi-Angel@HIDDEN>, Stefan Monnier <monnier@HIDDEN> In-Reply-To: <d3c423c7b2ced498ff6c1b23e1e67926410d4bf0.camel@HIDDEN> (message from Konstantin Kharlamov on Sat, 17 Feb 2024 13:16:14 +0300) Subject: Re: bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file References: <d3c423c7b2ced498ff6c1b23e1e67926410d4bf0.camel@HIDDEN> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -4.2 (----) X-Debbugs-Envelope-To: 69220 Cc: 69220 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -5.2 (-----) > From: Konstantin Kharlamov <Hi-Angel@HIDDEN> > Date: Sat, 17 Feb 2024 13:16:14 +0300 > > This implements a feature request from here¹ about having a function to > resolve all conflicts simultaneously. Although question author didn't > reply, but either way I think it's a useful functional. I needed it so > many times, but before stumbling upon this question I just didn't know > there are functions `smerge-keep-upper/base/lower`, and so ofc I never > though of writing a new one that would apply them to all conflicts. 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. I'm also guessing one could have the same effect by giving a prefix argument of suitable value to the conflict-resolution command. 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. Thanks.
bug-gnu-emacs@HIDDEN:bug#69220; Package emacs.
Full text available.Received: (at submit) by debbugs.gnu.org; 18 Feb 2024 18:23:18 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Feb 18 13:23:18 2024 Received: from localhost ([127.0.0.1]:37168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rbloq-0003Ab-5c for submit <at> debbugs.gnu.org; Sun, 18 Feb 2024 13:23:17 -0500 Received: from lists.gnu.org ([209.51.188.17]:53956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <Hi-Angel@HIDDEN>) id 1rblR4-0001mW-WB for submit <at> debbugs.gnu.org; Sun, 18 Feb 2024 12:58:45 -0500 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 <Hi-Angel@HIDDEN>) id 1rbHk5-00018X-UV for bug-gnu-emacs@HIDDEN; Sat, 17 Feb 2024 05:16:21 -0500 Received: from forward100c.mail.yandex.net ([2a02:6b8:c03:500:1:45:d181:d100]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <Hi-Angel@HIDDEN>) id 1rbHk3-0008Lp-Ud for bug-gnu-emacs@HIDDEN; Sat, 17 Feb 2024 05:16:21 -0500 Received: from mail-nwsmtp-smtp-production-main-38.myt.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-38.myt.yp-c.yandex.net [IPv6:2a02:6b8:c12:448d:0:640:3464:0]) by forward100c.mail.yandex.net (Yandex) with ESMTPS id 1FA9F60032 for <bug-gnu-emacs@HIDDEN>; Sat, 17 Feb 2024 13:16:15 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-38.myt.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id EGLxZRBoGGk0-BkYeJXdM; Sat, 17 Feb 2024 13:16:14 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1708164974; bh=IJOofnndvFd4SSvsqJY6HAH3zSz8TF0jLn9B6JSREXQ=; h=Date:To:From:Subject:Message-ID; b=O7FGQZs3DWbE26tTMqRY6TUZTzA9Iszc5NOqpubHbXo2RJr69lAUqMXDDBoOiRMB5 qfUAtOWUfZZEspW/iNcCl4FGCNA6/zdiz1MUJzgZ7MRFdR7bcrYfqO1aQGZyGfjR0A 54q3MwmIwG93sgf9kLUhQH2SPENv79vv3vofuzcc= Authentication-Results: mail-nwsmtp-smtp-production-main-38.myt.yp-c.yandex.net; dkim=pass header.i=@yandex.ru Message-ID: <d3c423c7b2ced498ff6c1b23e1e67926410d4bf0.camel@HIDDEN> Subject: [PATCH] smerge-mode: add a function to resolve all conflicts in a file From: Konstantin Kharlamov <Hi-Angel@HIDDEN> To: bug-gnu-emacs@HIDDEN Date: Sat, 17 Feb 2024 13:16:14 +0300 Content-Type: multipart/mixed; boundary="=-1tGhaRw1K/ELi3lrR1ey" User-Agent: Evolution 3.50.3 MIME-Version: 1.0 Received-SPF: pass client-ip=2a02:6b8:c03:500:1:45:d181:d100; envelope-from=Hi-Angel@HIDDEN; helo=forward100c.mail.yandex.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.5 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -4.5 (----) --=-1tGhaRw1K/ELi3lrR1ey Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable This implements a feature request from here=C2=B9 about having a function t= o resolve all conflicts simultaneously. Although question author didn't reply, but either way I think it's a useful functional. I needed it so many times, but before stumbling upon this question I just didn't know there are functions `smerge-keep-upper/base/lower`, and so ofc I never though of writing a new one that would apply them to all conflicts. It might be useful to make a function to do the same within a git-repo, but for now let's have at least a function that does that within a file. 1: https://emacs.stackexchange.com/questions/80361/when-merging-conflicts-in-s= merge-mode-how-to-select-mine-for-all-conflicts --=-1tGhaRw1K/ELi3lrR1ey Content-Disposition: attachment; filename="1.patch" Content-Type: text/x-patch; name="1.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAxNzAyZDdjMGY3ODJhOGUxOGIyNTM5MTk0YTViMjc2NzA3MTgxMzUzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLb25zdGFudGluIEtoYXJsYW1vdiA8SGktQW5nZWxAeWFuZGV4 LnJ1PgpEYXRlOiBTYXQsIDE3IEZlYiAyMDI0IDEyOjQzOjAyICswMzAwClN1YmplY3Q6IFtQQVRD SF0gc21lcmdlLW1vZGU6IGFkZCBhIGZ1bmN0aW9uIHRvIHJlc29sdmUgYWxsIGNvbmZsaWN0cyBp biBhCiBmaWxlCgoqIGxpc3AvdmMvc21lcmdlLW1vZGUuZWwgKHNtZXJnZS1yZXNvbHZlLWFsbC1p bi1maWxlLXRvKTogYSBuZXcKaW50ZXJhY3RpdmUgZnVuY3Rpb24gdG8gcmVzb2x2ZSBhbGwgY29u ZmxpY3RzIGluIGEgZmlsZS4KLS0tCiBldGMvTkVXUyAgICAgICAgICAgICAgIHwgIDYgKysrKysr CiBsaXNwL3ZjL3NtZXJnZS1tb2RlLmVsIHwgMjEgKysrKysrKysrKysrKysrKysrKysrCiAyIGZp bGVzIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9ldGMvTkVXUyBiL2V0 Yy9ORVdTCmluZGV4IDliZGMzYWY1ZTcxLi5iN2E0ODQxMmY0ZiAxMDA2NDQKLS0tIGEvZXRjL05F V1MKKysrIGIvZXRjL05FV1MKQEAgLTExNzAsNiArMTE3MCwxMiBAQCBTaW1pbGFybHkgdG8gYnVm ZmVyIHJlc3RvcmF0aW9uIGJ5IERlc2t0b3AsICdyZWNlbnRmLW1vZGUnIGNoZWNraW5nCiBvZiB0 aGUgYWNjZXNzaWJpbGl0eSBvZiByZW1vdGUgZmlsZXMgY2FuIG5vdyB0aW1lIG91dCBpZgogJ3Jl bW90ZS1maWxlLW5hbWUtYWNjZXNzLXRpbWVvdXQnIGlzIHNldCB0byBhIHBvc2l0aXZlIG51bWJl ci4KIAorKiogU21lcmdlIG1vZGUKKworKioqIE5ldyBpbnRlcmFjdGl2ZSBmdW5jdGlvbiAnc21l cmdlLXJlc29sdmUtYWxsLWluLWZpbGUtdG8nLgorQWxsb3dzIHRvIHJlc29sdmUgYWxsIGNvbmZs aWN0cyBpbnNpZGUgYSBmaWxlIGluIHByZWZlcmVuY2Ugb2YgJ3VwcGVyJworb3IgJ2Jhc2UnIG9y ICdsb3dlcicuCisKICoqIE5vdGlmaWNhdGlvbnMKIAogKysrCmRpZmYgLS1naXQgYS9saXNwL3Zj L3NtZXJnZS1tb2RlLmVsIGIvbGlzcC92Yy9zbWVyZ2UtbW9kZS5lbAppbmRleCBhMTZjNzg3MWZm OS4uYzMyNDEwYmNiMTUgMTAwNjQ0Ci0tLSBhL2xpc3AvdmMvc21lcmdlLW1vZGUuZWwKKysrIGIv bGlzcC92Yy9zbWVyZ2UtbW9kZS5lbApAQCAtNzE0LDYgKzcxNCwyNyBAQCBzbWVyZ2Uta2VlcC11 cHBlcgogICAoc21lcmdlLWtlZXAtbiAxKQogICAoc21lcmdlLWF1dG8tbGVhdmUpKQogCisoZGVm dW4gc21lcmdlLXJlc29sdmUtYWxsLWluLWZpbGUtdG8gKHRvLWtlZXApCisgICJSZXNvbHZlcyBh bGwgY29uZmxpY3RzIGluc2lkZSBhIGZpbGUgaW4gcHJlZmVyZW5jZSBvZiBUTy1LRUVQLgorCitU Ty1LRUVQIGRlY2lkZXMgd2hpY2ggcGFydCB0byBrZWVwIGFuZCBpcyBvbmUgb2YgYHVwcGVyJywg YGJhc2UnLAorYGxvd2VyJyIuCisgIChpbnRlcmFjdGl2ZQorICAgKGxpc3QgKGNvbXBsZXRpbmct cmVhZCAiS2VlcGluZzogIiBbdXBwZXIgYmFzZSBsb3dlcl0pKSkKKyAgKGxldCAoKHJlc29sdmUt ZnVuYworICAgICAgICAgKHBjYXNlIHRvLWtlZXAKKyAgICAgICAgICAgKCJ1cHBlciIgJ3NtZXJn ZS1rZWVwLXVwcGVyKQorICAgICAgICAgICAoImJhc2UiICAnc21lcmdlLWtlZXAtYmFzZSkKKyAg ICAgICAgICAgKCJsb3dlciIgJ3NtZXJnZS1rZWVwLWxvd2VyKQorICAgICAgICAgICAoXyAoZXJy b3IgIlVua25vd24gcmVzb2x1dGlvbiBhcmd1bWVudCEiKSkpKQorICAgICAgICAobnVtLWNoYXJz LWJlZm9yZSAocG9pbnQtbWF4KSkpCisgICAgKHNhdmUtZXhjdXJzaW9uCisgICAgICAoZ290by1j aGFyIChwb2ludC1taW4pKQorICAgICAgKHdoaWxlIChpZ25vcmUtZXJyb3JzIChub3QgKHNtZXJn ZS1uZXh0KSkpCisgICAgICAgIChmdW5jYWxsIHJlc29sdmUtZnVuYykpKQorICAgICh3aGVuICg9 IG51bS1jaGFycy1iZWZvcmUgKHBvaW50LW1heCkpCisgICAgICAobWVzc2FnZSAiTm8gY29uZmxp Y3RzIHdlcmUgZm91bmQiKSkpKQorCiAoZGVmaW5lLW9ic29sZXRlLWZ1bmN0aW9uLWFsaWFzICdz bWVyZ2Uta2VlcC1taW5lICdzbWVyZ2Uta2VlcC11cHBlciAiMjYuMSIpCiAKIChkZWZ1biBzbWVy Z2UtZ2V0LWN1cnJlbnQgKCkKLS0gCjIuNDMuMAoK --=-1tGhaRw1K/ELi3lrR1ey--
Konstantin Kharlamov <Hi-Angel@HIDDEN>:bug-gnu-emacs@HIDDEN.
Full text available.bug-gnu-emacs@HIDDEN:bug#69220; Package emacs.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.