package merge-fmt
Git mergetool leveraging code formatters
Install
Dune Dependency
Authors
Maintainers
Sources
merge-fmt-0.1.tbz
md5=c9d91ece7d70f1335945d97cd0be13e3
Description
merge-fmt
is a small wrapper on top git commands to help resolve conflicts by leveraging code formatters.
Published: 19 Feb 2019
README
Merge-fmt - git mergetool leveraging code formatters
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:
ocamlformat for OCaml.
refmt for reason.
Note that supporting new code formatters is trivial.
Getting starting
There are two ways to use merge-fmt.
Standalone
Just call merge-fmt
while there are unresolved conflicts. merge-fmt
will try resolve conflicts automatically.
As a Git mergetool
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
Install
$ opam pin add merge-fmt git@github.com:hhugo/merge-fmt.git
sectionYPositions = computeSectionYPositions($el), 10)"
x-init="setTimeout(() => sectionYPositions = computeSectionYPositions($el), 10)"
>
On This Page