https://blog.csdn.net/qq827245563/article/details/80347416?utm_medium=distribute.pc_relevant.none-task-blog-baidujs-1
https://blog.csdn.net/u012643122/article/details/52933013
1.工程->Team->同步:
2、从远程pull至本地,就会出现如下内容:
3、使用Merge Tool,执行第二项