{ "info": { "author": "", "author_email": "", "bugtrack_url": null, "classifiers": [ "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3 :: Only" ], "description": "", "description_content_type": "", "docs_url": null, "download_url": "", "downloads": { "last_day": -1, "last_month": -1, "last_week": -1 }, "home_page": "https://github.com/chrisgavin/conflictify/", "keywords": "", "license": "", "maintainer": "", "maintainer_email": "", "name": "conflictify", "package_url": "https://pypi.org/project/conflictify/", "platform": "", "project_url": "https://pypi.org/project/conflictify/", "project_urls": { "Homepage": "https://github.com/chrisgavin/conflictify/" }, "release_url": "https://pypi.org/project/conflictify/1.0.4/", "requires_dist": null, "requires_python": ">=3.5", "summary": "A Python module for identifying which files have merge conflicts between two branches in a Git checkout.", "version": "1.0.4" }, "last_serial": 4694919, "releases": { "1.0.0": [ { "comment_text": "", "digests": { "md5": "dd29ffc0baa2a792a10adca1fafbd0bf", "sha256": "fa7c16cea0988a8e25203c940628a291e46413a937c53a7ee56de62e2b83f973" }, "downloads": -1, "filename": "conflictify-1.0.0.tar.gz", "has_sig": false, "md5_digest": "dd29ffc0baa2a792a10adca1fafbd0bf", "packagetype": "sdist", "python_version": "source", "requires_python": ">=3.5", "size": 1836, "upload_time": "2018-12-18T19:04:11", "url": "https://files.pythonhosted.org/packages/04/76/bd4e6621de377e40f747bccbb7470e1477c7655591a7829feef6770df9b8/conflictify-1.0.0.tar.gz" } ], "1.0.1": [ { "comment_text": "", "digests": { "md5": "33852d192cc28adfc17d939c74347bd9", "sha256": "4464cd3193ae270bce65fa3ed561eab2cb182178ed3d5ea3014b81b28cd43484" }, "downloads": -1, "filename": "conflictify-1.0.1.tar.gz", "has_sig": false, "md5_digest": "33852d192cc28adfc17d939c74347bd9", "packagetype": "sdist", "python_version": "source", "requires_python": ">=3.5", "size": 1928, "upload_time": "2019-01-03T11:06:05", "url": "https://files.pythonhosted.org/packages/f3/bf/29b41632945094d7209413def0d1c17b33c6d70e0e7d8e83eb21d63d01c3/conflictify-1.0.1.tar.gz" } ], "1.0.2": [ { "comment_text": "", "digests": { "md5": "6570738dd1ed7faa505c4ae866730130", "sha256": "d40931d02208274163d2d4fef2953169158d59728491de85d2e46c70442ce5ae" }, "downloads": -1, "filename": "conflictify-1.0.2.tar.gz", "has_sig": false, "md5_digest": "6570738dd1ed7faa505c4ae866730130", "packagetype": "sdist", "python_version": "source", "requires_python": ">=3.5", "size": 1895, "upload_time": "2019-01-03T14:18:52", "url": "https://files.pythonhosted.org/packages/2b/21/555ac22dc5d9b23786725d31f151935c58f2c98d321bfe2cefb06bfb1f36/conflictify-1.0.2.tar.gz" } ], "1.0.3": [ { "comment_text": "", "digests": { "md5": "2761b9a44d224c66aa38a70825a2a83d", "sha256": "f219427f49dc9adafca15cb349c8bec16dc35e6c70a4c632dcea99c6e9c894cd" }, "downloads": -1, "filename": "conflictify-1.0.3.tar.gz", "has_sig": false, "md5_digest": "2761b9a44d224c66aa38a70825a2a83d", "packagetype": "sdist", "python_version": "source", "requires_python": ">=3.5", "size": 1916, "upload_time": "2019-01-03T15:27:49", "url": "https://files.pythonhosted.org/packages/18/56/f22f9a8bc0b45ff13b4906ca948ffa8be927243c00870c8ac5d8a45c3eb5/conflictify-1.0.3.tar.gz" } ], "1.0.4": [ { "comment_text": "", "digests": { "md5": "e3b918b8514b8d73149b11162701599c", "sha256": "f405415f23962d99f2aef0b916a6e251427a95de74f0680a9feacdcb5dc695b4" }, "downloads": -1, "filename": "conflictify-1.0.4.tar.gz", "has_sig": false, "md5_digest": "e3b918b8514b8d73149b11162701599c", "packagetype": "sdist", "python_version": "source", "requires_python": ">=3.5", "size": 1937, "upload_time": "2019-01-14T16:32:36", "url": "https://files.pythonhosted.org/packages/f5/ad/1a7ed660ed0d1f7941a6fca807c37062c015a2623e9bce29921532ec39d7/conflictify-1.0.4.tar.gz" } ] }, "urls": [ { "comment_text": "", "digests": { "md5": "e3b918b8514b8d73149b11162701599c", "sha256": "f405415f23962d99f2aef0b916a6e251427a95de74f0680a9feacdcb5dc695b4" }, "downloads": -1, "filename": "conflictify-1.0.4.tar.gz", "has_sig": false, "md5_digest": "e3b918b8514b8d73149b11162701599c", "packagetype": "sdist", "python_version": "source", "requires_python": ">=3.5", "size": 1937, "upload_time": "2019-01-14T16:32:36", "url": "https://files.pythonhosted.org/packages/f5/ad/1a7ed660ed0d1f7941a6fca807c37062c015a2623e9bce29921532ec39d7/conflictify-1.0.4.tar.gz" } ] }