Skip to main content

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.3.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.3-brightgreen.svg)](http://automergetool.readthedocs.io/en/stable/?badge=0.3) [![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 use pip:

`$ pip install automergetool`

… or using easy_install:

`$ easy_install automergetool`

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](http://automergetool.readthedocs.io/en/stable/installation.html) and [configuration](http://automergetool.readthedocs.io/en/stable/configuration.html) 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)

Project details


Download files

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

Filename, size & hash SHA256 hash help File type Python version Upload date
automergetool-0.3.0.tar.gz (18.4 kB) Copy SHA256 hash SHA256 Source None

Supported by

Elastic Elastic Search Pingdom Pingdom Monitoring Google Google BigQuery Sentry Sentry Error logging AWS AWS Cloud computing DataDog DataDog Monitoring Fastly Fastly CDN SignalFx SignalFx Supporter DigiCert DigiCert EV certificate StatusPage StatusPage Status page