alnorris / conflictwatch

Check all remote branches against your current HEAD and staging for merge conflicts, without having to actually merge.

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

conflictwatch

Check all remote branches against your current HEAD and staging for merge conflicts, without having to actually merge.

Guide

pip install conflictwatch

conflictwatch will let you know if origin/master will have a merge conflict

conflictwatch --all-branches will check all remote branches include origin/master

Note: This is definitely in BETA.

About

Check all remote branches against your current HEAD and staging for merge conflicts, without having to actually merge.

License:MIT License


Languages

Language:Python 100.0%