我试图做git stash apply
和我得到:不能做git的藏匿处申请
warning: Cannot merge binary files: app.xcodeproj/project.xcworkspace/xcuserdata/aditya15417.xcuserdatad/UserInterfaceState.xcuserstate (Updated upstream vs. Stashed changes)
Auto-merging app.xcodeproj/project.xcworkspace/xcuserdata/aditya15417.xcuserdatad/UserInterfaceState.xcuserstate
CONFLICT (content): Merge conflict in app.xcodeproj/project.xcworkspace/xcuserdata/aditya15417.xcuserdatad/UserInterfaceState.xcuserstate
我该如何解决这个问题?
删除您有用于存储有关工作区(窗口和布局和这样)数据文件的合并冲突。你真的应该通过http://help.github.com/ignore-files/ – CrimsonDiego