sync master (rebase) git rebase master git rebase --continue git push -f overwrite local w/ remote git reset --hard origin/branch-name