Subject: bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file

From: Andreas Schwab <[email-masked]>
Date: Mon, 19 Feb 2024 13:44:40 +0100

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, [email-masked]
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."