danglotb / conflict-merge-solver

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

conflict-merge-solver Build StatusCoverage Status

This project aims at resolving automatically merge conflict.

Merge conflict appears when you have two pull requests at the same time, that modify (the same) near piece of code. The resolution cannot be done by git(hub) itself.

About

License:GNU General Public License v3.0


Languages

Language:Java 99.1%Language:Shell 0.9%