From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Konstantin Kharlamov 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 15:53:30 +0300 Message-ID: <3beba6eff9e1a4c74b470737ed299106fe5538ab.camel@yandex.ru> References: <865xykr79f.fsf@gnu.org> <0f2cffca61b65ef7c0bd65e3029068d05d64b513.camel@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13926"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Evolution 3.50.3 Cc: Eli Zaretskii , Stefan Monnier , 69220@debbugs.gnu.org To: Andreas Schwab Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Feb 19 13:55:04 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 1rc3Al-0003Sl-Nv for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 19 Feb 2024 13:55:03 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rc3AR-00026r-NX; Mon, 19 Feb 2024 07:54: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 1rc3AP-00026B-QH for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 07:54: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 1rc3AP-0008Pu-Hw for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 07:54:41 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rc3Ak-0004d3-J4 for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 07:55:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Konstantin Kharlamov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 19 Feb 2024 12:55: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.170834727217738 (code B ref 69220); Mon, 19 Feb 2024 12:55:02 +0000 Original-Received: (at 69220) by debbugs.gnu.org; 19 Feb 2024 12:54:32 +0000 Original-Received: from localhost ([127.0.0.1]:40658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc3AE-0004c0-L1 for submit@debbugs.gnu.org; Mon, 19 Feb 2024 07:54:32 -0500 Original-Received: from forward502c.mail.yandex.net ([178.154.239.210]:52846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc3AA-0004bm-1F for 69220@debbugs.gnu.org; Mon, 19 Feb 2024 07:54:29 -0500 Original-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) Original-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 In-Reply-To: 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:280260 Archived-At: 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.