|
From: | Dmitry Gutov |
Subject: | bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file |
Date: | Mon, 19 Feb 2024 17:20:45 +0200 |
User-agent: | Mozilla Thunderbird |
On 19/02/2024 14:03, Eli Zaretskii wrote:
Having said that, if this is deemed useful, why not? Adding Stefan to the discussion, in case he has comments. I'd also be interested in Dmitry's opinions.
Like Andreas described, doing a merge using an "ours" or "theirs" strategy is something that people do on occasion.
Whether it's a good option to be able to do in smerge as well, I don't have a relevant experience to comment on, but the patch looks short enough, so the added complexity is minimal.
[Prev in Thread] | Current Thread | [Next in Thread] |