📅  最后修改于: 2022-03-11 14:51:25.654000             🧑  作者: Mango
git checkout existingbranch
git merge master
git checkout master
git reset --hard HEAD~3 # Go back 3 commits. You *will* lose uncommitted work.
git checkout existingbranch