bug-gnu-emacs
[Top][All Lists]
Advanced

[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: Konstantin Kharlamov
Subject: bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file
Date: Sat, 17 Feb 2024 13:16:14 +0300
User-agent: Evolution 3.50.3

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.

It might be useful to make a function to do the same within a git-repo,
but for now let's have at least a function that does that within a
file.

1:
https://emacs.stackexchange.com/questions/80361/when-merging-conflicts-in-smerge-mode-how-to-select-mine-for-all-conflicts

Attachment: 1.patch
Description: Text Data


reply via email to

[Prev in Thread] Current Thread [Next in Thread]