jakub-g / git-resolve-conflict

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

Related projects

Alternatives and complementary repositories for git-resolve-conflict