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 Release notifications | RSS feed
Download files
Download the file for your platform. If you're not sure which to choose, learn more about installing packages.
Source Distributions
Built Distribution
Filter files by name, interpreter, ABI, and platform.
If you're not sure about the file name format, learn more about wheel file names.
Copy a direct link to the current filters
File details
Details for the file gitconflict-0.1-py3-none-any.whl.
File metadata
- Download URL: gitconflict-0.1-py3-none-any.whl
- Upload date:
- Size: 5.3 kB
- Tags: Python 3
- Uploaded using Trusted Publishing? No
File hashes
| Algorithm | Hash digest | |
|---|---|---|
| SHA256 |
7d3a073bce9566cbb486be0d7373dd7bed7c45709023342ddfb71f580cca3123
|
|
| MD5 |
3c5154d4218d042c9a0db51aad1133cf
|
|
| BLAKE2b-256 |
58fe039abb057a02e36276c1bfe7981bad0e9f2f333cb903950b92405498cfc0
|
