git pull出错:cannot pull into a repository with state: merging_resolved"
原创 super_junior 发表于:2018-09-05 15:34:03
  阅读 :8487   收藏   编辑

1

git pull 出错
解放办法:
1.尝试先提交现有代码到本地,再更新
2.git reset —hard