John Cox

Blogs · @wyome

Tagged version control · everything

Cocoa with Love: Version control for solo Mac developers

This guide demonstrates how to set up and use Git for version control in Xcode projects on Mac, emphasizing that even solo developers benefit from version control's ability to track changes more precisely than Time Machine, review their own code, and easily test across multiple machines. The author recommends the GitX graphical interface over command-line Git, provides step-by-step setup instructions including creating a .gitignore file and initial repository commits, and explains practical workflows like cloning repositories to other computers and managing third-party code as submodules.

Permalink

Chapter 4. Branching and Merging

A branch is a line of development that diverges from another line while maintaining a shared history, like creating separate copies of a document that evolve independently but can still share common changes. Subversion implements branching through copy operations that remember the relationship between the original and copied versions, allowing developers to track and synchronize changes across parallel branches. The system supports creating branches, merging changes between them, and even mixing different branches within a single working copy.

Permalink