From: Andreas Schwab <schwab@suse.de>
To: Dmitry Gutov <dmitry@gutov.dev>
Cc: Eli Zaretskii <eliz@gnu.org>,
Stefan Monnier <monnier@iro.umontreal.ca>,
69220@debbugs.gnu.org, Konstantin Kharlamov <Hi-Angel@yandex.ru>
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 [thread overview]
Message-ID: <mvm34toxy8y.fsf@suse.de> (raw)
In-Reply-To: <4eed07a3-1df5-48f9-be9a-1655721118f1@gutov.dev> (Dmitry Gutov's message of "Mon, 19 Feb 2024 17:20:45 +0200")
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."
next prev parent reply other threads:[~2024-02-19 15:35 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-17 10:16 bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file Konstantin Kharlamov
2024-02-19 12:03 ` Eli Zaretskii
2024-02-19 12:17 ` Konstantin Kharlamov
2024-02-19 12:25 ` Andreas Schwab
2024-02-19 12:28 ` Konstantin Kharlamov
2024-02-19 12:33 ` Andreas Schwab
2024-02-19 12:38 ` Konstantin Kharlamov
2024-02-19 12:44 ` Andreas Schwab
2024-02-19 12:53 ` Konstantin Kharlamov
2024-02-19 17:07 ` Konstantin Kharlamov
2024-02-20 15:34 ` Konstantin Kharlamov
2024-02-19 15:20 ` Dmitry Gutov
2024-02-19 15:35 ` Andreas Schwab [this message]
2024-02-19 15:31 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-19 17:25 ` Konstantin Kharlamov
2024-02-20 2:24 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-20 3:02 ` Konstantin Kharlamov
2024-02-20 3:15 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-20 3:24 ` Konstantin Kharlamov
2024-02-20 3:40 ` Konstantin Kharlamov
2024-02-20 13:53 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-20 13:59 ` Konstantin Kharlamov
2024-02-20 14:03 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-20 14:10 ` Konstantin Kharlamov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=mvm34toxy8y.fsf@suse.de \
--to=schwab@suse.de \
--cc=69220@debbugs.gnu.org \
--cc=Hi-Angel@yandex.ru \
--cc=dmitry@gutov.dev \
--cc=eliz@gnu.org \
--cc=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).