【踩坑】Git变基拉取时报错

前言

Git变基拉取时报错:There are pending unresolved conflicts.Then you may continue rebase. You also may abort rebase to restore the original branch and stop rebasing.

解决问题

1
git rebase --abort

完成

参考文献

CSDN——猪猪上