A small bash script that handles synchronization conflicts with Syncthing. Inspired by 'pacdiff' from Arch Linux.
-
Updated
Feb 11, 2023 - Shell
A small bash script that handles synchronization conflicts with Syncthing. Inspired by 'pacdiff' from Arch Linux.
💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
A small bash script that handles synchronization conflicts with Syncthing. Inspired by 'pacdiff' from Arch Linux.
Create a custom git command to perform a rebase via a merge
A git merge driver for google-java-format.
Add a description, image, and links to the conflict-resolution topic page so that developers can more easily learn about it.
To associate your repository with the conflict-resolution topic, visit your repo's landing page and select "manage topics."