Xcode Treasures

Branching and Merging

If this was all there was to source control, it would amount to little more than a deliberate file backup system. Where it gets interesting, however, is when multiple developers are involved, each working on their own set of changes.

When you clone a repo from GitHub, you create your own history in a copy of the original. At some point, you may want to reconcile those histories. To start that process, you first do a pull. With a pull, you’ll get changes from the remote origin repository and incorporate them into your repo. In Xcode, you initiate a pull request with the Source Control -> Pull menu item. Looking in the opposite ...