Better handle of checkout when local branch is existing