Git conflict for xcode 6.1 in storyboard
Question
How to solve conflict for git in xcode for one storyboard.
Point 1 :: In my project I m having one storyboard not multiple storyboard. Can not create multiple storyboard because project UI is 70% Done and more than 2+ developer are working on project. Xcode is not able solve conflict by its own while it solve for other files but not for storyboard.
Can any one help me to resolve this issue in better way.
1 answers
solution1
0 2014-12-29 09:48:12
我通过将添加它的.DS_Store文件放入忽略文件夹中解决了问题...
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.
Related Question
StoryBoard issue in Xcode 6.1
Xcode 5 storyboard for iOS 6.1
xcode 6.1 iphone/ipad storyboard
Xcode crashes when there is conflict in storyboard
All xib and storyboard files crashes Xcode 6.1
Can't open storyboard in Xcode 6.1
Xcode 6.1 Becomes Unresponsive when I open the storyboard
when opening storyboard file in xcode 6.1, mac turns black
Git says xcode storyboard file is modified
Why some view's frame become (0,0,0,0) when I try to resize other view in storyboard in Xcode 6.1
Related Tags