đź’˛ âž• âž– âś… Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
-
Updated
Jan 20, 2025 - Shell
#
git-mergetools
Here are 6 public repositories matching this topic...
Half automatic merge toolchain for git
-
Updated
Jun 25, 2020 - Python
Simple and efficient way to delete remote branches from git repository.
-
Updated
Jan 10, 2018 - Shell
Make resolving merge conflicts in Neovim a breeze.
-
Updated
May 4, 2026 - Lua
Merge is an interactive, command line interface application designed to simplify and accelerate Git merge conflict resolution.
-
Updated
Aug 12, 2025 - Python
Script for auto merging branches with master
-
Updated
Oct 30, 2019 - Shell
Improve this page
Add a description, image, and links to the git-mergetools topic page so that developers can more easily learn about it.
Add this topic to your repo
To associate your repository with the git-mergetools topic, visit your repo's landing page and select "manage topics."