Xcode - Storyboard edits by multiple users cause Source Control conflicts

Originator:ski081
Number:rdar://14225088 Date Originated:6/20/2013
Status:Open Resolved:
Product:Developer Tools Product Version:4.6.3 (4H1503)
Classification: Reproducible:Yes
 
20-Jun-2013 10:58 PM Mark Struzinski:
Summary:
Any time 2 developers are editing storyboards in the same project and both commit to source control, it causes merge conflicts

Steps to Reproduce:
Edit a storyboard on 2 different machines based on the same source control revision
Try to commit from both machines. The 2nd commit will cause a merge conflict.

Expected Results:
Enhancements to storyboards would prevent these conflicts or make them easier to resolve

Actual Results:
Merge conflict causes extra development time to untangle. The only way to avoid it is to not make changes at the same time.

Regression:

Notes:

Comments


Please note: Reports posted here will not necessarily be seen by Apple. All problems should be submitted at bugreport.apple.com before they are posted here. Please only post information for Radars that you have filed yourself, and please do not include Apple confidential information in your posts. Thank you!