geoadmin/mf-geoadmin3 — pull request #1086 by gjn (2014-02-07 11:30:45+00:00)
Title: Deploybranch: Assure force-pushed branches update correctly

When deploybranching a branch that was force-pushed to github (because of rebase or otherwise re-written history), it was possible to have merge conflicts, resulting in the update not working correctly.

This PR adresses this issue by deleting the local branch before pulling in the changes from remote.