Big news! Sonar has entered a definitive agreement to acquire Tidelift!

conflictify
Release 1.0.4

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

Homepage Repository PyPI Python

Install: pip install conflictify==1.0.4

Documentation

Merge Conflict Detector

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

Dependencies: 0
Dependent packages: 0
Dependent repositories: 0
Total releases: 5
Latest release: Jan 14, 2019
First release: Dec 18, 2018
Stars: 0
Forks: 0
Watchers: 1
Contributors: 1
Repository size: 57.6 KB
SourceRank: 7

Releases

1.0.4: Jan 14, 2019
1.0.3: Jan 3, 2019
1.0.2: Jan 3, 2019
1.0.1: Jan 3, 2019
1.0.0: Dec 18, 2018

Contributors

See all contributors

Login to resync this project