冲突（内容）：合并冲突
[英]CONFLICT (content): Merge conflict in
问题描述
I'm trying to push a project using git but i always get these conflicts. 
我正在尝试使用git推送项目，但我总是遇到这些冲突。
Auto-merging App.xcodeproj/xcuserdata/user.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
CONFLICT (content): Merge conflict in App.xcodeproj/xcuserdata/user.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.
I added the App.xcodeproj/xcuserdata/user.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist to .gitignore and after that i started to get a conflict on that file. 我加入了App.xcodeproj/xcuserdata/user.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist到.gitignore ，之后我开始在该文件上的冲突。
What can i do, besides git-pull which deletes the majority of files in my project. 除了git-pull删除项目中的大多数文件外，我还能做什么。
2 个解决方案
解决方案1
0 2015-06-25 16:45:14
只需编辑.gitignore文件，解决冲突，然后将其添加到索引中并提交即可。
解决方案2
0 已采纳 2015-06-25 16:51:33
I tried this : 我尝试了这个：
git pull --rebase https://github.com/yours master/name of your branch
and after some working around i solved the problem. 经过一些解决后，我解决了问题。
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.