Another update to Xcode Treasures beta is released today. This is about Source Code Management .
To be honest, this could well be called The Git Chapter since Xcode's protocol-agnostic source control features release support for Subversion, leaving Git as Highlander – the style there can only be a winner.
And to be even more honest, this chapter has more than anything other than limitations in Xcode. Our IDE of well-we-not-really-have-a-choice does not offer all Git commands, and does not even try. Some commands, such as
bisect will require a completely different user interface to implement, and the hard core historical rewriting commands such as
cherry choice and
rebase are apparently above Xcode's salary quality.
So what's the point? In practice, many developers use Xcode's Git support … as well as using a different system like the command line or the GitHub app. Someone uses Xcode's fine user interface to make visual diffs; Others make it easy to commit themselves to Xcode, instead of losing their speed by swapping apps. The chapter comes into the features you may decide to select and select.
It also has one of my editor's favorite jokes / references throughout the book (it's either this or "spirit season / wabbit season" joke back in Chapter 6):
And for those of you who are outside of Xcode, it's a part of how to resolve conflicts on the command line with
/ Programs / Tools / FileMerge :
In the top there are even some tips for resolving confusion conflicts in project files and storyboards, along with some fingers waiting for better development practices that would have kept you hypothetically from having a storyboard merger conflict in the first place (but yes you can give opinion about storyboard XML and resolve a merger conflict by hand if you are brave … i actually did it myself a couple of times and i'm not dead you t).