结果失败了:
The working copy "iOS-Client" failed to merge. error: Your local changes to the following files would be overwritten by merge: JianDao/JianDao.xcodeproj/project.xcworkspace/xcuserdata/crifan.xcuserdatad/UserInterfaceState.xcuserstate Please, commit your changes or stash them before you can merge. Aborting |
搜:
xcode error: Your local changes to the following files would be overwritten by merge
参考:
ios – Source control in XCode is a nightmare – can anyone offer advice? – Stack Overflow
去看看:
结果没找到.gitignore文件:
去搜:
xcode error: Your local changes to the following files would be overwritten UserInterfaceState.xcuserstate
Git ask me to commit ignored files – Stack Overflow
ios – Source control in XCode is a nightmare – can anyone offer advice? – Stack Overflow
licrifandeMacBook-Pro:iOS-Client crifan$ git status –ignored On branch v1.0 Your branch is up-to-date with ‘origin/v1.0’. Unmerged paths: (use "git reset HEAD <file>…" to unstage) (use "git add <file>…" to mark resolution) both modified: JianDao/JianDao.xcodeproj/project.xcworkspace/xcuserdata/crifan.xcuserdatad/UserInterfaceState.xcuserstate Untracked files: (use "git add <file>…" to include in what will be committed) JianDao/JianDao.xcodeproj/project.xcworkspace/xcuserdata/crifan.xcuserdatad/WorkspaceSettings.xcsettings JianDao/JianDao.xcodeproj/xcuserdata/crifan.xcuserdatad/xcdebugger/ Ignored files: (use "git add -f <file>…" to include in what will be committed) JianDao/JianDao/Assets.xcassets/.DS_Store JianDao/JianDao/Assets.xcassets/AddPerson/.DS_Store JianDao/JianDao/Assets.xcassets/Contact/.DS_Store JianDao/JianDao/Assets.xcassets/Conversation/.DS_Store JianDao/JianDao/Assets.xcassets/DropDownList/.DS_Store JianDao/JianDao/Assets.xcassets/File/.DS_Store JianDao/JianDao/Assets.xcassets/My/.DS_Store no changes added to commit (use "git add" and/or "git commit -a") |
然后去搞清楚 .gitignore:
然后再去
merge into branch
结果:
但是要去搞懂:
[已解决]Xcode中改动的User Interface State到底是什么意思
转载请注明:在路上 » [已解决]Xcode中merge失败:error Your local changes to the following files would be overwritten by merge UserInterfaceState.xcuserstate