💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
-
Updated
Aug 29, 2022 - Shell
💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
Half automatic merge toolchain for git
Simple and efficient way to delete remote branches from git repository.
Merge is an interactive, command line interface application designed to simplify and accelerate Git merge conflict resolution.
Script for auto merging branches with master
Add a description, image, and links to the git-mergetools topic page so that developers can more easily learn about it.
To associate your repository with the git-mergetools topic, visit your repo's landing page and select "manage topics."