snoopycrimecop/snoopycrimecop — pull request #14 by sbesson (2012-11-27 08:25:23+00:00)
Title: Always merge

Fix issue reported in #13 as well as other bugs
- fix bug when recording conflicting PRs list
- Use `reset --hard`` rather than ``merge --ff-only`` because the latter command seemed to hang on a couple of times when calling ``p.wait`` in the call command

This script has been successfully tested with the builds 70 and 71 of the [OMERO-merge-4.4](http://hudson.openmicroscopy.org.uk/view/4.4/job/OMERO-merge-4.4/) job.