Xcode 工程配置，git 冲突, xcuserdata

最新推荐文章于 2025-07-11 16:02:55 发布

原创最新推荐文章于 2025-07-11 16:02:55 发布 · 875 阅读

0 ·

CC 4.0 BY-SA版权

文章标签：

#xcode #git #ios

git 专栏收录该内容

15 篇文章

订阅专栏

本文介绍了如何处理Xcode工程中xcuserdata导致的git冲突。通过删除远端及本地暂存区的myFolder目录，保留工作区的设置，避免git冲突。核心在于正确管理开发者个人信息，确保工程配置不影响版本控制。

删除远端的，和本地暂存区的

保留工作区的

主要原因，就是前期，

没有配置

.gitignore

删除工程配置的，开发者个人信息


➜  ios git:(feature/chatRoom)  git rm -r --cached  /Users/jzd/Movies/work/____XXXXXX/ios/hahaha/hahaha.xcodeproj/xcuserdata
rm 'hahaha/hahaha.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/xcschememanagement.plist'
➜  ios git:(feature/chatRoom) ✗ git rm -r --cached /Users/jzd/Movies/work/____XXXXXX/ios/hahaha/hahaha.xcworkspace/xcuserdata 
rm 'hahaha/hahaha.xcworkspace/xcuserdata/666.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist'
➜  ios git:(feature/chatRoom) ✗ git rm -r --cached  /Users/jzd/Movies/work/____XXXXXX/ios/hahaha/Pods/Pods.xcodeproj/xcuserdata 
rm 'hahaha/Pods/Pods.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/Alamofire.xcscheme'
rm 'hahaha/Pods/Pods.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/DeviceKit.xcscheme'
rm 'hahaha/Pods/Pods.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/FSPagerView.xcscheme'
rm 'hahaha/Pods/Pods.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/HXPhotoPicker.xcscheme'
rm 'hahaha/Pods/Pods.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/HandyJSON.xcscheme'
rm 'hahaha/Pods/Pods.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/JXPagingView.xcscheme'
rm 'hahaha/Pods/Pods.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/JXSegmentedView.xcscheme'
rm 'hahaha/Pods/Pods.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/Kingfisher.xcscheme'
rm 'hahaha/Pods/Pods.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/KingfisherWebP.xcscheme'
rm 'hahaha/Pods/Pods.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/MJRefresh.xcscheme'
rm 'hahaha/Pods/Pods.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/Moya.xcscheme'
rm 'hahaha/Pods/Pods.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/Pods-hahaha.xcscheme'
rm 'hahaha/Pods/Pods.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/QMUIKit-QMUIResources.xcscheme'
rm 'hahaha/Pods/Pods.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/QMUIKit.xcscheme'
rm 'hahaha/Pods/Pods.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/SnapKit.xcscheme'
rm 'hahaha/Pods/Pods.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/libwebp.xcscheme'
rm 'hahaha/Pods/Pods.xcodeproj/xcuserdata/666.xcuserdatad/xcschemes/xcschememanagement.plist'