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