git pull出错:cannot pull into a repository with state: merging_resolved_git

 

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