git rebase 过程遇到的问题

git push origin local_branch:refs/for/remotes_branch

出现： [remote rejected] HEAD -> xxxxxx (no new changes)

error: failed to push some refs to 'xxxx

以远程master （注意 远程分支名称 可以origin/master 或 remotes/origin/master）

git rebase -i remotes/origin/master


It seems that there is already a rebase-apply directory, and
I wonder if you are in the middle of another rebase.  If that is the
case, please try
git rebase (--continue | --abort | --skip)
If that is not the case, please
rm -fr "xxxxx/git/rebase-apply"
and run me again.  I am stopping in case you still have something
valuable there.

尝试第一步 git rebase --continue --abort --skip 都不行

直接执行 rm -rf xxxx之后

git push origin HEAD:refs/for/xxx 依然失败

git rebase -i master

git push origin HEAD:refs/for/xxx 终于成功

总结：