jakub-g / git-resolve-conflict

Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
52Updated 2 years ago

Alternatives and similar repositories for git-resolve-conflict:

Users that are interested in git-resolve-conflict are comparing it to the libraries listed below