Mergedroid: a bot to reduce manual conflict resolution on GitHub pull requests(blog.gmaster.io)4 points by psantosl 8 years ago | 1 comment