Skip to main content
This is a pre-production deployment of Warehouse. Changes made here affect the production instance of PyPI (
Help us improve Python packaging - Donate today!

Git merge-conflicts checker

Project Description

Conflicts is a solution to check whether git branches conflict with each other

or not without doing actual merge. get_first_conflict(list_of_heads) will return a tuple (HEAD1, HEAD2, file_containing_conflicting_changes) describing first found conflict or None if there are no conflicts at all. The package also provides “git-conflict” script. Run it as “git conflict HEAD1 HEAD2…”. It returns 1 if its arguments are heads which do not conflict with each other, and 0 otherwise. Both function and script accept arguments in tree-ish form, for instance: master, 123abcde(SHA), HEAD^^.

Written and tested with Python 3.2 runtime.

Release History

This version
History Node


Download Files

Download the file for your platform. If you're not sure which to choose, learn more about installing packages.

Filename, Size & Hash SHA256 Hash Help File Type Python Version Upload Date
(5.3 kB) Copy SHA256 Hash SHA256
Wheel 3.2 Feb 14, 2015

Supported By

Elastic Elastic Search Pingdom Pingdom Monitoring Dyn Dyn DNS Sentry Sentry Error Logging CloudAMQP CloudAMQP RabbitMQ Kabu Creative Kabu Creative UX & Design Fastly Fastly CDN DigiCert DigiCert EV Certificate Google Google Cloud Servers