From b0ffa1a3e68a685f5479e24c8ca54ffd1a7eaa10 Mon Sep 17 00:00:00 2001 From: Mirek Kratochvil Date: Sun, 31 Aug 2025 13:13:53 +0200 Subject: [PATCH] hint --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index f5e54e0..c579da0 100644 --- a/README.md +++ b/README.md @@ -221,6 +221,10 @@ marked files in the repository. On conflict, you will have the files marked with the usual (werge's usual) conflict markers, and you will be able to resolve them just as with the normal merging workflow. +**Hint:** As with `spacewerge` mergetool above, it is beneficial to add a few +conflict-resolving options such as `-s` to the `driver`, in order to help the +automerges pass nicely. + ### Use with `git rebase` The merge driver and mergetools as configured above will also automatically