Landkid

Landkid helps you avoid merge hell when merging pull requests.

In a nut shell it basically:

• Creates a merge queue preventing more than one person merging at a time
• Rebases your branch build on lastest master so that you know master will be green when you merge

You can look at the current state of Landkid here.