Try marking your storyboards as binary files in git. It worked pretty well for me the last time I was working with a designer and using xib files.