It may be easier just to ````git reset --HARD branch```` as this will avoid any possible merge issues.