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:44:40 +0100 Message-ID: References: <865xykr79f.fsf@gnu.org> <0f2cffca61b65ef7c0bd65e3029068d05d64b513.camel@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="12466"; 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:47:16 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 1rc33D-0002zH-6H for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 19 Feb 2024 13:47:15 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rc32r-0006rx-0t; Mon, 19 Feb 2024 07:46:55 -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 1rc32f-0006rW-Oa for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 07:46:42 -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 1rc32f-00076J-CG for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 07:46:41 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rc330-0004Ja-CU for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 07:47: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:47: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.170834677316521 (code B ref 69220); Mon, 19 Feb 2024 12:47:02 +0000 Original-Received: (at 69220) by debbugs.gnu.org; 19 Feb 2024 12:46:13 +0000 Original-Received: from localhost ([127.0.0.1]:40617 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc32B-0004IO-Ox for submit@debbugs.gnu.org; Mon, 19 Feb 2024 07:46:13 -0500 Original-Received: from smtp-out2.suse.de ([195.135.223.131]:59618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc329-0004Dt-NB for 69220@debbugs.gnu.org; Mon, 19 Feb 2024 07:46:11 -0500 Original-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== Original-Received: by hawking.nue2.suse.org (Postfix, from userid 17005) id CA7914A0389; Mon, 19 Feb 2024 13:44:40 +0100 (CET) In-Reply-To: (Konstantin Kharlamov's message of "Mon, 19 Feb 2024 15:38:51 +0300") X-Yow: Alright, you!! Imitate a WOUNDED SEAL pleading for a PARKING SPACE!! Authentication-Results: smtp-out2.suse.de; none 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-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:280258 Archived-At: 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@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."