{
    "info": {
        "author": "Xavier F. Gouchet",
        "author_email": "python@xgouchet.fr",
        "bugtrack_url": null,
        "classifiers": [
            "Development Status :: 4 - Beta",
            "Intended Audience :: Developers",
            "License :: OSI Approved :: Apache Software License",
            "Programming Language :: Python :: 3.5",
            "Programming Language :: Python :: 3.6",
            "Programming Language :: Python :: 3.7",
            "Topic :: Software Development :: Version Control :: Git"
        ],
        "description": "# AutoMergeTool\n\n> AutoMergeTool is a tool compatible with git to simplify the process of solving conflicts after a git merge, rebase or cherry-pick.\n\n[![Version](https://img.shields.io/badge/Version-0.3.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)\n[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)\n[![Python](https://img.shields.io/badge/Python-3.5-blue.svg)](https://docs.python.org/3/whatsnew/3.5.html)\n\n\n[![Documentation Status](https://img.shields.io/badge/docs-0.3-brightgreen.svg)](http://automergetool.readthedocs.io/en/stable/?badge=0.3)\n[![Build Status](https://travis-ci.org/xgouchet/AutoMergeTool.svg?branch=master)](https://travis-ci.org/xgouchet/AutoMergeTool)\n[![Coverage](https://codecov.io/gh/xgouchet/AutoMergeTool/branch/master/graph/badge.svg)](https://codecov.io/gh/xgouchet/AutoMergeTool)\n\nAMT enables you to chain automatic solvers on git conflicts, before openning your preferred manual merge tool (meld, kdiff, winmerge, \u2026). It is currently under active development, and used internally in the Deezer Android team.\n\n\n\n## Installation\n\n**TL;DR;** The easiest way to install AMT is to use `pip`:\n\n```$ pip install automergetool```\n\n\u2026 or using `easy\\_install`:\n\n```$ easy_install automergetool```\n\nThen include the following inside your `~/.gitconfig` file :\n\n    [merge]\n        tool = amt\n        conflictstyle = diff3\n    [mergetool \"amt\"]\n        cmd = /path/to/amt.py -b \"$BASE\" -l \"$LOCAL\" -r \"$REMOTE\" -m \"$MERGED\"\n    [amt]\n        tools = gen_simplify;gen_woven;gen_additions;gen_deletions;meld\n\n**Prerequisite** : AutoMergeTool requires Python 3.5, and won't work with Python 2.x.\n\nYou can also read the documentation for [installation](http://automergetool.readthedocs.io/en/stable/installation.html) and [configuration](http://automergetool.readthedocs.io/en/stable/configuration.html) instructions.\n\n## Usage example\n\nJust use it as your default `mergetool`\n\n## Release History\n\n * This app is currently in alpha version\n\n## Contribute\n\nIf you want to contribute, please follow the [Contribution guidelines](CONTRIBUTING.md).\n\n## See Also\n\n - Contact me on Twitter [@xgouchet](https://twitter.com/xgouchet)\n - [Git Mergetool documentation](https://git-scm.com/docs/git-mergetool)\n - [Git Config documentation](https://git-scm.com/docs/git-config)\n\n## License\n\nThis program is distributed under the [Apache License 2.0](https://opensource.org/licenses/Apache-2.0)\n\n",
        "description_content_type": null,
        "docs_url": null,
        "download_url": "",
        "downloads": {
            "last_day": -1,
            "last_month": -1,
            "last_week": -1
        },
        "home_page": "https://github.com/xgouchet/AutoMergeTool",
        "keywords": "git merge conflicts",
        "license": "Apache 2.0",
        "maintainer": "",
        "maintainer_email": "",
        "name": "automergetool",
        "package_url": "https://pypi.org/project/automergetool/",
        "platform": "",
        "project_url": "https://pypi.org/project/automergetool/",
        "project_urls": {
            "Homepage": "https://github.com/xgouchet/AutoMergeTool"
        },
        "release_url": "https://pypi.org/project/automergetool/0.3.0/",
        "requires_dist": null,
        "requires_python": "",
        "summary": "A tool to simplify the process of solving conflicts after a git merge, rebase or cherry-pick.",
        "version": "0.3.0"
    },
    "last_serial": 3501894,
    "releases": {
        "0.2.0": [
            {
                "comment_text": "",
                "digests": {
                    "md5": "389376464616f4e5e5a70d8bdda47dad",
                    "sha256": "1b35d6d55c2a241605ca9545941d962111f5b5bbdd10d855f91dbe187dcf0994"
                },
                "downloads": -1,
                "filename": "automergetool-0.2.0.tar.gz",
                "has_sig": false,
                "md5_digest": "389376464616f4e5e5a70d8bdda47dad",
                "packagetype": "sdist",
                "python_version": "source",
                "requires_python": null,
                "size": 14639,
                "upload_time": "2017-10-12T14:51:34",
                "url": "https://files.pythonhosted.org/packages/9c/03/6b836e65879d285b7a299f623400cd987104253df251cadc6ab425960e58/automergetool-0.2.0.tar.gz"
            }
        ],
        "0.3.0": [
            {
                "comment_text": "",
                "digests": {
                    "md5": "3e6018ddb65cfd04d5ec78badf1dbea0",
                    "sha256": "942170228c54eae898527d8c5c054386fdf24ca7e7aef44ca994643b412eef8e"
                },
                "downloads": -1,
                "filename": "automergetool-0.3.0.tar.gz",
                "has_sig": false,
                "md5_digest": "3e6018ddb65cfd04d5ec78badf1dbea0",
                "packagetype": "sdist",
                "python_version": "source",
                "requires_python": null,
                "size": 18352,
                "upload_time": "2018-01-18T19:14:57",
                "url": "https://files.pythonhosted.org/packages/b5/80/3e624cb5480f112ca55577106bb35572f98e278ae6d81ef5982f2a2f1ac8/automergetool-0.3.0.tar.gz"
            }
        ]
    },
    "urls": [
        {
            "comment_text": "",
            "digests": {
                "md5": "3e6018ddb65cfd04d5ec78badf1dbea0",
                "sha256": "942170228c54eae898527d8c5c054386fdf24ca7e7aef44ca994643b412eef8e"
            },
            "downloads": -1,
            "filename": "automergetool-0.3.0.tar.gz",
            "has_sig": false,
            "md5_digest": "3e6018ddb65cfd04d5ec78badf1dbea0",
            "packagetype": "sdist",
            "python_version": "source",
            "requires_python": null,
            "size": 18352,
            "upload_time": "2018-01-18T19:14:57",
            "url": "https://files.pythonhosted.org/packages/b5/80/3e624cb5480f112ca55577106bb35572f98e278ae6d81ef5982f2a2f1ac8/automergetool-0.3.0.tar.gz"
        }
    ]
}