https://github.com/alnorris/conflictwatch

Check all remote branches against your current HEAD and staging for merge conflicts, without having to actually merge.
https://github.com/alnorris/conflictwatch

Last synced: 5 days ago
JSON representation

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

• Host: GitHub
• URL: https://github.com/alnorris/conflictwatch
• Owner: alnorris
• License: mit
• Created: 2021-08-14T19:38:19.000Z (over 3 years ago)
• Default Branch: master
• Last Pushed: 2021-08-14T19:45:51.000Z (over 3 years ago)
• Last Synced: 2024-09-17T05:19:01.964Z (about 2 months ago)
• Language: Python
• Size: 7.81 KB
• Stars: 0
• Watchers: 2
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md
  • License: LICENSE

Awesome Lists containing this project

README

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