gs（git status）一下，提示信息：
You are currently rebasing branch 'master' on '6ff7d77'.
(all conflicts fixed: run "git rebase --continue”)
当前分支停留在“ 6ff7d77”提交上时，运行git rebase —continue后提示
error: Ref refs/heads/master is at 30222e596f87fe0ec2e74a4fe152d91af495e489 but expected 1f48a9a53201ca92f03d32d12f5a5a456f9b893c
fatal: Cannot lock the ref 'refs/heads/master'.
Could not move back to refs/heads/master
依次运行
git update-ref refs/heads/master 1f48a9a53201ca92f03d32d12f5a5a456f9b893c
rebase —continue
gs
根据gs后的提示操作
（这里我的提示是：git pull）