The update script hung because a merge conflict caused an MCMergeBrowser to pop up. We shouldn't have conflicts, but if we do, we should always choose the remote version (because we should never have any local state).