conflict init checkout-commit branching merge branches pull-push rebase reorder bisect