Implemented local branch merging during update.

I'm sure I did this before, I must have discarded it by mistake... Also
removed update retry, as there's some permissions issue that occurs with
the repo packfiles whenever it is done.