#

git-mergetools

Here are 4 public repositories matching this topic...

jakub-g / git-resolve-conflict

💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)

git merge-conflicts conflict-resolution git-mergetools resolve-conflicts conflicting-changes

Updated Aug 29, 2022
Shell

xgouchet / AutoMergeTool

Half automatic merge toolchain for git

python git conflict-resolution git-mergetools hacktoberfest hacktoberfest2020 hacktoberfest2021

Updated Jun 25, 2020
Python

hyperia-sk / remote-branch-housekeeping

Simple and efficient way to delete remote branches from git repository.

git remote cleaner branch git-mergetools housekeeping git-branch git-merge git-branching

Updated Jan 10, 2018
Shell

salexivich / auto_merge_sh_script

Script for auto merging branches with master

git shell-script git-mergetools

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.

Curate this topic

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."