Mergedroid: a bot to reduce manual conflict resolution on GitHub pull requestsblog.gmaster.io·4 pts·psantosl·1
A programming-language-aware, refactor-ready merge toolcodicesoftware.blogspot.com·17 pts·psantosl·15