1.问题描述

MacBook-Pro:gupaoedu gaoxinfu$ git pull
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
MacBook-Pro:gupaoedu gaoxinfu$ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 11 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:

···
ple01/DemoNacosConfigController.java
	new file:   3.分布式与微服务/3.5.分布式服务治理/3.5.29-30.Apache Nacos配置中心的应用及原理分析(上下)/demo/demo-gupao-nacos-example01/src/main/java/com/gaoxinfu/demo/gupao/nacos/demogupaonacosexample01/DemoNacosSdk.java
	new file:   3.分布式与微服务/3.5.分布式服务治理/3.5.29-30.Apache Nacos配置中心的应用及原理分析(上下)/nacos-demo.zip
	modified:   README.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   3.分布式与微服务/3.5.分布式服务治理/3.5.17-18.ApacheDubbo的基本认识/demo/demo-gupao-dubbo-example02/.idea/workspace.xml

2.解决方案

1.说明本地和远程的东西同时修改了workspace.xml文件，直接还原本地即可

MacBook-Pro:gupaoedu gaoxinfu$ git reset --hard FETCH_HEAD
HEAD is now at 715da29 更新 README.md
MacBook-Pro:gupaoedu gaoxinfu$ git pull
Already up to date.
MacBook-Pro:gupaoedu gaoxinfu$ git pull
Already up to date.
MacBook-Pro:gupaoedu gaoxinfu$ cd