gitlabhq/gitlabhq — pull request #3242 by murank (2013-03-17 16:00:26+00:00)
Title: Fix failure of cheking a merge request after conflict.

Once a merge request conflicts, the next check will also fail even if the request can be merged,
because clearing a conflicting satellite fails.

We should reset worktree first in order to checkout the parking branch and delete all branches correctly.