Ask HN: Co-Development, XCode, Git and Storyboards. Is there a decent solution?
1) Tiptoe around the commits. Just coordinate your work to minimize stepping on each other's toes. Which means constant 'I'm pushing changes to x storyboard now' and 'Are you working in y storyboard?' This is fine/mildly irritating with a two person team, but it would be hell with anyone else involved.
2) Granularity. Break your storyboards down into the minimum reasonable piece. This method means that it is less likely that you are going to be working on the same file. Although, this doesn't prevent conversations about who is working on what, it just minimizes them.
I ask you, good people of HN, is there another, better way?