WARNING: This tool is still experimental.
merge-fmt is a small wrapper on top git commands to help resolve conflicts by leveraging code formatters.
merge-fmt currently only knows about the following formatters:
Note that supporting new code formatters is trivial.
There are two ways to use merge-fmt.
Just call merge-fmt while there are unresolved conflicts. merge-fmt will try resolve conflicts automatically.
merge-fmt can act as a git mergetool. First configure the current git repository with merge-fmt mergetool-setup --update Then, use git mergetool to resolve conflicts with git mergetool -t mergefmt
$ opam pin add merge-fmt git@github.com:hhugo/merge-fmt.git