git操作报错 can‘t continue rebase

git操作报错 rebase not allowed 和 can‘t continue rebase

There are pending unresolved conflicts.Then you may continue rebase. You also may abort rebase to restore the original branch and stop rebasing.

解决方法

git rebase --abort