GitHub topics: git-mergetools
jakub-g/git-resolve-conflict
:heavy_dollar_sign: :heavy_plus_sign: :heavy_minus_sign: :white_check_mark: Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
Language: Shell - Size: 34.2 KB - Last synced at: 8 days ago - Pushed at: 3 months ago - Stars: 52 - Forks: 10
skandrigi/MergeCLI
Merge is an interactive, command line interface application designed to simplify and accelerate Git merge conflict resolution.
Language: Python - Size: 11.1 MB - Last synced at: 3 months ago - Pushed at: 6 months ago - Stars: 4 - Forks: 0
xgouchet/AutoMergeTool
Half automatic merge toolchain for git
Language: Python - Size: 177 KB - Last synced at: 5 days ago - Pushed at: almost 5 years ago - Stars: 42 - Forks: 4
salexivich/auto_merge_sh_script
Script for auto merging branches with master
Language: Shell - Size: 1000 Bytes - Last synced at: about 2 years ago - Pushed at: over 5 years ago - Stars: 0 - Forks: 0
hyperia-sk/remote-branch-housekeeping
Simple and efficient way to delete remote branches from git repository.
Language: Shell - Size: 23.4 KB - Last synced at: about 12 hours ago - Pushed at: over 7 years ago - Stars: 15 - Forks: 1
