{ "info": { "author": "Vasily Makarov", "author_email": "einmalfel@gmail.com", "bugtrack_url": null, "classifiers": [ "Development Status :: 2 - Pre-Alpha", "Environment :: Console", "License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)", "Operating System :: POSIX :: Linux", "Programming Language :: Python :: 3.2", "Programming Language :: Python :: 3 :: Only", "Topic :: Software Development :: Version Control" ], "description": "Conflicts is a solution to check whether git branches conflict with each other\r\n or not without doing actual merge.\r\n get_first_conflict(list_of_heads) will return a tuple\r\n (HEAD1, HEAD2, file_containing_conflicting_changes) describing first found\r\n conflict or None if there are no conflicts at all.\r\n The package also provides \"git-conflict\" script.\r\n Run it as \"git conflict HEAD1 HEAD2...\". It returns 1 if its arguments\r\n are heads which do not conflict with each other, and 0 otherwise.\r\n Both function and script accept arguments in tree-ish form, for instance:\r\n master, 123abcde(SHA), HEAD^^.\r\n \r\n Written and tested with Python 3.2 runtime.", "description_content_type": null, "docs_url": null, "download_url": "", "downloads": { "last_day": -1, "last_month": -1, "last_week": -1 }, "home_page": "https://github.com/einmalfel/git-aflow", "keywords": "git merge conflict detector git-aflow", "license": "GNU LGPL 2.1", "maintainer": "", "maintainer_email": "", "name": "gitconflict", "package_url": "https://pypi.org/project/gitconflict/", "platform": "UNKNOWN", "project_url": "https://pypi.org/project/gitconflict/", "project_urls": { "Homepage": "https://github.com/einmalfel/git-aflow" }, "release_url": "https://pypi.org/project/gitconflict/0.1/", "requires_dist": null, "requires_python": null, "summary": "Git merge-conflicts checker", "version": "0.1" }, "last_serial": 1423170, "releases": { "0.1": [ { "comment_text": "", "digests": { "md5": "3c5154d4218d042c9a0db51aad1133cf", "sha256": "7d3a073bce9566cbb486be0d7373dd7bed7c45709023342ddfb71f580cca3123" }, "downloads": -1, "filename": "gitconflict-0.1-py3-none-any.whl", "has_sig": false, "md5_digest": "3c5154d4218d042c9a0db51aad1133cf", "packagetype": "bdist_wheel", "python_version": "3.2", "requires_python": null, "size": 5294, "upload_time": "2015-02-14T15:07:01", "url": "https://files.pythonhosted.org/packages/58/fe/039abb057a02e36276c1bfe7981bad0e9f2f333cb903950b92405498cfc0/gitconflict-0.1-py3-none-any.whl" } ] }, "urls": [ { "comment_text": "", "digests": { "md5": "3c5154d4218d042c9a0db51aad1133cf", "sha256": "7d3a073bce9566cbb486be0d7373dd7bed7c45709023342ddfb71f580cca3123" }, "downloads": -1, "filename": "gitconflict-0.1-py3-none-any.whl", "has_sig": false, "md5_digest": "3c5154d4218d042c9a0db51aad1133cf", "packagetype": "bdist_wheel", "python_version": "3.2", "requires_python": null, "size": 5294, "upload_time": "2015-02-14T15:07:01", "url": "https://files.pythonhosted.org/packages/58/fe/039abb057a02e36276c1bfe7981bad0e9f2f333cb903950b92405498cfc0/gitconflict-0.1-py3-none-any.whl" } ] }