Yelp/pushmanager — pull request #61 by rschlaikjer (2014-06-11 00:41:55+00:00)
Title: Add git conflict detection

Add methods to automatically check for merge conflicts between:
- Pickme'd branches and master
- Pickme'd branches and other pickme'd branches for the same push