Xcode最新版Version 8.0 (8A218a)在使用自带git进行代码控制的时候，如果本地与远程没有conflicts可以正常使用，但是本地和远程存在conflicts时，使用git pull并不会出现merge窗口，也没有将远程代码更新到本地，Xcode自带的git pull界面只是一闪而过。
Version 8.0 (8A218a)
git pull
然而，使用git命令行是可以正常的pull，手动merge后，命令行也是可以正常push的。
所以，这是Xcode8的bug吗？不知道大家有没有遇到。
业精于勤，荒于嬉;行成于思，毁于随。
Xcode has been having problems. So either use the sourcetruee tool, or just do it directly from the command line.
He said that he also encountered this problem and used the command line to solve it. However, it would be too troublesome if there are too many conflicts. Please provide a solution
请问楼主现在解决了吗？望传授解决方法！
Have you solved it?
My current solution is to use SourceTree in the team to replace Xcode version management, which is very easy to use. Link
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
Xcode has been having problems. So either use the sourcetruee tool, or just do it directly from the command line.
He said that he also encountered this problem and used the command line to solve it. However, it would be too troublesome if there are too many conflicts. Please provide a solution
Same question, if there is a conflict when pulling xcode, no page will pop up. No more content
请问楼主现在解决了吗？望传授解决方法！Have you solved it?
My current solution is to use SourceTree in the team to replace Xcode version management, which is very easy to use. Link