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

Previous Next

Full log

Message #8 received at 69220 <at> debbugs.gnu.org (full text, mbox):

From: Eli Zaretskii <eliz <at> gnu.org>
To: Konstantin Kharlamov <Hi-Angel <at> yandex.ru>,
 Stefan Monnier <monnier <at> iro.umontreal.ca>
Cc: 69220 <at> debbugs.gnu.org
Subject: Re: bug#69220: [PATCH] smerge-mode: add a function to resolve all
 conflicts in a file
Date: Mon, 19 Feb 2024 14:03:08 +0200

> From: Konstantin Kharlamov <Hi-Angel <at> yandex.ru>
> Date: Sat, 17 Feb 2024 13:16:14 +0300
> 
> This implements a feature request from here¹ about having a function to
> resolve all conflicts simultaneously. Although question author didn't
> reply, but either way I think it's a useful functional. I needed it so
> many times, but before stumbling upon this question I just didn't know
> there are functions `smerge-keep-upper/base/lower`, and so ofc I never
> though of writing a new one that would apply them to all conflicts.

I use SMerge quite a lot, but never yet had a situation where the same
resolution was applicable to all of the conflicts, let alone knew that
in advance, before looking at each conflict.

I'm also guessing one could have the same effect by giving a prefix
argument of suitable value to the conflict-resolution command.

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.

Thanks.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.