Metadata-Version: 2.0
Name: gitconflict
Version: 0.1
Summary: Git merge-conflicts checker
Home-page: https://github.com/einmalfel/git-aflow
Author: Vasily Makarov
Author-email: einmalfel@gmail.com
License: GNU LGPL 2.1
Keywords: git merge conflict detector git-aflow
Platform: UNKNOWN
Classifier: Development Status :: 2 - Pre-Alpha
Classifier: Environment :: Console
Classifier: Operating System :: POSIX :: Linux
Classifier: Programming Language :: Python :: 3 :: Only
Classifier: Programming Language :: Python :: 3.2
Classifier: Topic :: Software Development :: Version Control
Classifier: License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)
Provides: gitconflict
Requires-Dist: thingitwrapper

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.3 runtime.


