Ecosyste.ms: Awesome

An open API service indexing awesome lists of open source software.

Awesome Lists | Featured Topics | Projects

https://github.com/xgouchet/automergetool

Half automatic merge toolchain for git
https://github.com/xgouchet/automergetool

conflict-resolution git git-mergetools hacktoberfest hacktoberfest2020 hacktoberfest2021 python

Last synced: about 2 months ago
JSON representation

Half automatic merge toolchain for git

Host: GitHub
URL: https://github.com/xgouchet/automergetool
Owner: xgouchet
License: apache-2.0
Created: 2016-11-23T08:33:11.000Z (about 8 years ago)
Default Branch: main
Last Pushed: 2020-06-25T06:44:08.000Z (over 4 years ago)
Last Synced: 2024-09-19T04:17:55.295Z (4 months ago)
Topics: conflict-resolution, git, git-mergetools, hacktoberfest, hacktoberfest2020, hacktoberfest2021, python
Language: Python
Homepage: https://github.com/xgouchet/AutoMergeTool/wiki
Size: 177 KB
Stars: 43
Watchers: 1
Forks: 4
Open Issues: 4
Metadata Files:
- Readme: README.md
- Contributing: CONTRIBUTING.md
- License: LICENSE

Awesome Lists containing this project

README

        # 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://github.com/xgouchet/AutoMergeTool)

[![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.

#### [Full Documentation](http://automergetool.readthedocs.io/en/stable/)

## 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

 - Contact me on Twitter [@xgouchet](https://twitter.com/xgouchet)

 - [Git Mergetool documentation](https://git-scm.com/docs/git-mergetool)

 - [Git Config documentation](https://git-scm.com/docs/git-config)

## License

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