Skip to main content

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.

Project details


Release history Release notifications | RSS feed

This version

0.1

Download files

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

Files for gitconflict, version 0.1
Filename, size File type Python version Upload date Hashes
Filename, size gitconflict-0.1-py3-none-any.whl (5.3 kB) File type Wheel Python version 3.2 Upload date Hashes View

Supported by

Pingdom Pingdom Monitoring Google Google Object Storage and Download Analytics Sentry Sentry Error logging AWS AWS Cloud computing DataDog DataDog Monitoring Fastly Fastly CDN DigiCert DigiCert EV certificate StatusPage StatusPage Status page