AutoMergeTool

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

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 and configuration instructions.

Full Documentation

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.

See Also

• Contact me on Twitter @xgouchet
• Git Mergetool documentation
• Git Config documentation

License

This program is distributed under the Apache License 2.0