【踩坑】Git变基拉取时报错 发表于 2023-04-20 更新于 2024-04-28 阅读次数: 前言Git变基拉取时报错:There are pending unresolved conflicts.Then you may continue rebase. You also may abort rebase to restore the original branch and stop rebasing. 解决问题1git rebase --abort 完成参考文献CSDN——猪猪上