diff options
| author | Mirek Kratochvil <exa.exa@gmail.com> | 2025-08-31 13:13:53 +0200 |
|---|---|---|
| committer | Mirek Kratochvil <exa.exa@gmail.com> | 2025-08-31 13:13:53 +0200 |
| commit | b0ffa1a3e68a685f5479e24c8ca54ffd1a7eaa10 (patch) | |
| tree | f1929d9935189990e1526ef8dbc048c77c4a1cc6 | |
| parent | ecb03d3be41f56d00cb0f6c32636052f5e2a7626 (diff) | |
| download | werge-b0ffa1a3e68a685f5479e24c8ca54ffd1a7eaa10.tar.gz werge-b0ffa1a3e68a685f5479e24c8ca54ffd1a7eaa10.tar.bz2 | |
hint
| -rw-r--r-- | README.md | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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 |