conflictify

A Python module for identifying which files have merge conflicts between two branches in a Git checkout.


Install
pip install conflictify==1.0.3

Documentation

Merge Conflict Detector

A very simple library for detecting merge conflicts between refs in local Git repositories.