撤销merge(撤销本身也作为一次正常的提交):
git revert {merge_id} -m 1
git push
回退到某个commit id(commit id之后的提交丢弃):
git reset --hard commit id
git push -f origin branch
删除本地分支缓存:
git branch -d -r origin/branch_name
撤销merge(撤销本身也作为一次正常的提交):
git revert {merge_id} -m 1
git push
回退到某个commit id(commit id之后的提交丢弃):
git reset --hard commit id
git push -f origin branch
删除本地分支缓存:
git branch -d -r origin/branch_name