Are you running into merge conflicts with other people? Generally, we avoid any merge conflicts with XIB files. We have a small team so basically anyone who is

Are you running into merge conflicts with other people? Generally, we avoid any merge conflicts with XIB files. We have a small team so basically anyone who is dealing with it has an 'exclusive' lock until they are done. That includes avoiding having a feature branch that makes changes to XIB files that might change in the main branch. Merging XIB file changes isn't for the faint hearted - and the likelihood of having a working XIB file at the end of a merge is not 100%.