Version Control Git and the .gitignore file. Tips & tricks while merging complex XML files like Storyboards, XIB and the .xcodeproj file.