网站介绍：文章浏览阅读3.5w次，点赞29次，收藏56次。CONFLICT（content）：Merge conflict in XXXX/.DS_Store.AutoMatic merge failed；fix conflicts and then commit the result.意思是：冲突内容：合并冲突在 XXXX.DS_Store文件中自动合并失败；修改冲突然后提交修改后的结果。gitpull的时候：..._automatic merge failed; fix conflicts and then commit the result.
- 链接地址：https://blog.csdn.net/soulwyb/article/details/89305387#comments_21244257
- 链接标题：AutoMatic merge failed；fix conflicts and then commit the result_automatic merge failed; fix conflicts and then com-CSDN博客
- 所属网站：blog.csdn.net
- 被收藏次数：1353
- 网站标签：automatic merge failed; fix conflicts and then commit the result.
