[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 13:44:40 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
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."
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/18
- 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 <=
- 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, Konstantin Kharlamov, 2024/02/20
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, Stefan Monnier, 2024/02/19