exa/werge
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

hint

Browse source
This commit is contained in:
Mirek Kratochvil 2025-08-31 13:13:53 +02:00
parent ecb03d3be4
commit b0ffa1a3e6
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -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 with the usual (werge's usual) conflict markers, and you will be able to
resolve them just as with the normal merging workflow. 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` ### Use with `git rebase`
The merge driver and mergetools as configured above will also automatically The merge driver and mergetools as configured above will also automatically