袁凤鸣的博客 | Fleeming's Blog Front-end Dev Engineer

git 中忽略 UserInterfaceState.xcuserstate

2018-10-18
袁凤鸣


git 中忽略 UserInterfaceState.xcuserstate

1.UserInterfaceState.xcuserstate是什么?

该文件为xcode默认自带文件,是xcode的配置信息,git会用这个文件记录下来。
比如:手动删除此文件,退出xcode后重启xcode,设置了debug 调试断点等。此文件会自动创建并跟踪

SO, 此文件无需push,应忽略。不忽略的话在多人开发时提交文件时候会因为这个文件导致冲突。

2.使用.gitignore 如何解决?

终端输入以下指令:【网络比较流行的方案。但是对我无效。2018-10-18实测】

git rm --cached 工程名称.xcodeproj/project.xcworkspace/xcuserdata/电脑用户名称.xcuserdatad/UserInterfaceState.xcuserstate
    
git commit -m "Removed file that shouldn't be tracked"    
    
git push

我项目的.gitignore配置如下:

.DS_Store
*.xcuserstate
project.xcworkspace
UserInterfaceState.xcuserstate
oclint.html
build/
derivedData/
xcuserdata
xcuserdata/  
UserInterface.xcuserstate
*.xcbkptlist

配置完.gitignore文件后, 要注意下面一个前提

要进入该工程的路径中,也就是.xcodeproj的上一级,否则会出现以下错误

fatal: path spec '[ProjectFolder].xcodeproj/project.xcworkspace/xcuserdata/[myUserName].xcuserdatad/UserInterfaceState.xcuserstate' did not match any files

重点说明:我真的是按照如上步骤这样搞的。但是任然是如上挂了。在检查了其他能意识想到的情况后。后来寻思,既然提示匹配不到文件。是不是文件路径有问题呀。网上复制来复制去都是很久以前的方案了。新版xcode是不是改变了这个路径。

3.解决误区

按照如上思路。。在项目文件目录中到处找。因为我项目是用cocoapods来管理的 。所以有xcworkspace文件。最终在xcworkspace文件中找到目标文件。
路径:

FupingElectricity.xcworkspace/xcuserdata/mingo.xcuserdatad

然后:

git rm --cached FupingElectricity.xcworkspace/xcuserdata/mingo.xcuserdatad

给的提示是:

fatal: not removing 'FupingElectricity.xcworkspace/xcuserdata/mingo.xcuserdatad' recursively without -r

4.正确解决姿势

所以最终的正确命令如下:

git rm -r --cached [工程名称].xcworkspace/xcuserdata/[电脑用户名称].xcuserdatad
    
git commit -m "Removed file that shouldn't be tracked"    
    
git push

经过这些步骤后就完美解决了。

5.终端操作记录

   Last login: Thu Oct 18 14:58:49 on ttys005
Fengmings-iMac:~ mingo$ cd /Users/mingo/Desktop/AAAllGitRepos/jshop_cbd_ios
Fengmings-iMac:jshop_cbd_ios mingo$ ls -a
   .                CHANGELOG.md            Podfile.lock
   ..                FupingElectricity        Pods
   .DS_Store            FupingElectricity.xcodeproj    README.md
   .git                FupingElectricity.xcworkspace
   .gitignore            Podfile
Fengmings-iMac:jshop_cbd_ios mingo$ git rm --cached FupingElectricity.xcodeproj/xcuserdata/mingo.xcuserdatad/UserInterfaceState.xcuserstate
   fatal: pathspec 'FupingElectricity.xcodeproj/xcuserdata/mingo.xcuserdatad/UserInterfaceState.xcuserstate' did not match any files
Fengmings-iMac:jshop_cbd_ios mingo$ git rm --cached FupingElectricity.xcworkspace/xcuserdata/mingo.xcuserdatad
   fatal: not removing 'FupingElectricity.xcworkspace/xcuserdata/mingo.xcuserdatad' recursively without -r
Fengmings-iMac:jshop_cbd_ios mingo$ git rm -r --cached FupingElectricity.xcworkspace/xcuserdata/mingo.xcuserdatad
   rm 'FupingElectricity.xcworkspace/xcuserdata/mingo.xcuserdatad/IDEFindNavigatorScopes.plist'
   rm 'FupingElectricity.xcworkspace/xcuserdata/mingo.xcuserdatad/UserInterfaceState.xcuserstate'
   rm 'FupingElectricity.xcworkspace/xcuserdata/mingo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist'
Fengmings-iMac:jshop_cbd_ios mingo$ git commit -m "Removed file that shouldn't be tracked"
   [dev/shopv2 bf20f45] Removed file that shouldn't be tracked
   3 files changed, 51 deletions(-)
   delete mode 100644 FupingElectricity.xcworkspace/xcuserdata/mingo.xcuserdatad/IDEFindNavigatorScopes.plist
   delete mode 100644 FupingElectricity.xcworkspace/xcuserdata/mingo.xcuserdatad/UserInterfaceState.xcuserstate
   delete mode 100644 FupingElectricity.xcworkspace/xcuserdata/mingo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
Fengmings-iMac:jshop_cbd_ios mingo$ git push
   Username for 'https://gitee.com': yfmingo@163.com
   Password for 'https://yfmingo@163.com@gitee.com':
   Counting objects: 3, done.
   Delta compression using up to 4 threads.
   Compressing objects: 100% (3/3), done.
   Writing objects: 100% (3/3), 318 bytes | 318.00 KiB/s, done.
   Total 3 (delta 2), reused 0 (delta 0)
   remote: Powered by Gitee.com
   To https://gitee.com/wuhan_wan_teng/jshop_cbd_ios.git
   f2db7ec..bf20f45  dev/shopv2 -> dev/shopv2
Fengmings-iMac:jshop_cbd_ios mingo$



如果觉得我的文章对您有用,请随意打赏。您的支持将鼓励我继续创作!

¥ 打赏博主

请科学上网看评论 😂

Enjoy music ?
Search
    Content