v0.1.0

First release of git-mediate — a Git extension that identifies the specific commits responsible for merge conflicts before you merge.

Features

• Detects conflicts without touching your working tree, using git merge-tree --write-tree (Git 2.38+)
• Pinpoints the commits in your current branch that conflict with an incoming branch, via line-level git blame analysis
• git mediate <source> and explicit git mediate <source>..<target> syntax
• --debug flag for verbose conflict-detection output

Requirements

• Git 2.38+
• Python 3.6+

Install

git clone https://github.com/willregelmann/git-mediate.git
cd git-mediate
pip install .