Mergedroid: a bot to reduce manual conflict resolution on GitHub pull requests (blog.gmaster.io)

Tested with the Git repo itself, about 26% less merges need manual intervention: https://gmaster.io/mergedroid/analyze/report/gmasterscm/git

Still alpha.