jgibfried

I have had endless merge issues when working with other developers on iOS applications that utilize storyboards. After taking a gander around the internet for ways to solve the constant annoyance, I see two ways people…