[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts
From: |
Andreas Schwab |
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 |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
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."
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, (continued)
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Eli Zaretskii, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Andreas Schwab, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Andreas Schwab, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Andreas Schwab, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/19
bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Dmitry Gutov, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file,
Andreas Schwab <=
bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Stefan Monnier, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Stefan Monnier, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Stefan Monnier, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Stefan Monnier, 2024/02/20
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/20
bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Stefan Monnier, 2024/02/20