I added some minor documentation on how to use werge with git as mergetool and merge driver: https://github.com/exaexa/werge#integration-with-git It gets quite comfortable to use with proper config.
(Screenshot: random commit from linux vfs)
Discussion
Loading...
Post
@exa@mastodon.online i don’t do a lot of git merging but werge looks really cool
can you do pure difference (not sure on the term here)? like, having 2 files and just seeing what’s different? i saw the examples tended to work with old mine theirs but id be curious to know if it will do a “mine and theirs” style
bonfire.cafe
A space for Bonfire maintainers and contributors to communicate
Automatic federation enabled