Skip to main content
This is a pre-production deployment of Warehouse. Changes made here affect the production instance of PyPI (pypi.python.org).
Help us improve Python packaging - Donate today!

A tool to simplify the process of solving conflicts after a git merge, rebase or cherry-pick.

Project Description

# AutoMergeTool

> AutoMergeTool is a tool compatible with git to simplify the process of solving conflicts after a git merge, rebase or cherry-pick.

[![Version](https://img.shields.io/badge/Version-0.2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Python](https://img.shields.io/badge/Python-3.5-blue.svg)](https://docs.python.org/3/whatsnew/3.5.html)

[![Documentation Status](https://img.shields.io/badge/docs-0.2-brightgreen.svg)](http://automergetool.readthedocs.io/en/latest/?badge=0.2) [![Build Status](https://travis-ci.org/xgouchet/AutoMergeTool.svg?branch=master)](https://travis-ci.org/xgouchet/AutoMergeTool) [![Coverage](https://codecov.io/gh/xgouchet/AutoMergeTool/branch/master/graph/badge.svg)](https://codecov.io/gh/xgouchet/AutoMergeTool)

AMT enables you to chain automatic solvers on git conflicts, before openning your preferred manual merge tool (meld, kdiff, winmerge, …). It is currently under active development, and used internally in the Deezer Android team.

## Installation

TL;DR; The easiest way to install AMT is to [download](https://github.com/xgouchet/AutoMergeTool/archive/master.zip) or clone the archive somewhere, then include the following inside your ~/.gitconfig file :

[merge]
tool = amt conflictstyle = diff3
[mergetool “amt”]
cmd = /path/to/amt.py -b “$BASE” -l “$LOCAL” -r “$REMOTE” -m “$MERGED”
[amt]
tools = gen_simplify;gen_woven;gen_additions;gen_deletions;meld

Prerequisite : AutoMergeTool requires Python 3.5, and won’t work with Python 2.x.

You can also read the documentation for [installation](https://github.com/xgouchet/AutoMergeTool/wiki/Installation) and [configuration](https://github.com/xgouchet/AutoMergeTool/wiki/Configuration) instructions.

## Usage example

Just use it as your default mergetool

## Release History

  • This app is currently in alpha version

## Contribute

If you want to contribute, please follow the [Contribution guidelines](CONTRIBUTING.md).

## See Also

## License

This program is distributed under the [Apache License 2.0](https://opensource.org/licenses/Apache-2.0)

Release History

Release History

This version
History Node

0.2.0

Download Files

Download Files

Download the file for your platform. If you're not sure which to choose, learn more about installing packages.

File Name & Checksum SHA256 Checksum Help Version File Type Upload Date
automergetool-0.2.0.tar.gz (14.6 kB) Copy SHA256 Checksum SHA256 Source Oct 12, 2017

Supported By

WebFaction WebFaction Technical Writing Elastic Elastic Search Pingdom Pingdom Monitoring Dyn Dyn DNS Sentry Sentry Error Logging CloudAMQP CloudAMQP RabbitMQ Heroku Heroku PaaS Kabu Creative Kabu Creative UX & Design Fastly Fastly CDN DigiCert DigiCert EV Certificate Rackspace Rackspace Cloud Servers DreamHost DreamHost Log Hosting