当遇到Your branch and ‘origin/test-xxx‘ have diverged, and have 2 and 1 different commits each

错误提示：Your branch and ‘origin/test-xxx’ have diverged,
and have 2 and 1 different commits each, respectively.
(use “git pull” to merge the remote branch into yours)

解决办法：
git rebase origin/test-xxx

这时候出现
First, rewinding head to replay your work on top of it…
Applying: feat(xxx)

解决办法：
git fetch origin
git reset --hard origin/test-xxx

这时候出现
HEAD is now at … fix:描述文字
就代表已经解决，最后用git status检查一下状态。