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 '
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 ..." to mark resolution)
both modified: 3.分布式与微服务/3.5.分布式服务治理/3.5.17-18.apachedubbo的基本认识/demo/demo-gupao-dubbo-example02/.idea/workspace.xml
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