Cannot do a soft reset in the middle of a merge

git reset --merge

注：取消合并

git rebase

注：将当前分支重新设置基线