Today, I learned about the hell that can be git merging .pbxproj and .storyboard files in iOS. I got to experience first hand the importance of good clear commits.
Some thoughts on how to do this (better):
Regardless, I sense that I will be using these git commands a lot more in the coming days:
See keep either file in merge conflicts for more.
You must be logged in to post a comment.
Receive notifications of new posts by email.
2015 © Objective Li Labs LLC