[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: |
Stefan Monnier |
Subject: |
bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file |
Date: |
Mon, 19 Feb 2024 10:31:44 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
> 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.
Yeah, I'm not sure we need this.
It would be easy enough to provide a kind of prefix command
`smerge-apply-all-conflicts` which reads the next key and calls the
corresponding command in every conflict in the file.
It would generalize `smerge-resolve-all`.
I have needed such a thing in the past, but there are several ways to do
that already: beside telling Git beforehand how to resolve the
conflicts, you can also use things like
C-x ( C-c ^ n C-c ^ u C-x e e e e e e e e e
- Stefan
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, (continued)
- 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, 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/19
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 <=
- 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, Stefan Monnier, 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, Stefan Monnier, 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/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Stefan Monnier, 2024/02/20
- 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, Stefan Monnier, 2024/02/20
bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/20