#git

It's 17:00 on a warm Friday evening, as you type the final characters into your PR description your mind drifts to the coming weekend. During that weekend you decide to work on that open-source you cloned a while back, so you head to GitHub to look through the open issues. Like many developers, you use the same GitHub account for both your personal and work projects so when you open GitHub, you can't avoid seeing that a colleague has spent some of their weekend leaving comments on your PR. You're now faced…

For some time now I have been thinking about how best to use branching on my projects to ease my overhead and allow for all the possible states that an iOS app can be in during development. I've been using the following branching model for just over a year now and I'm finding it works very well for myself and my team. master Current version of the app with Apple. You should NEVER develop on this branch. After each merge master branch should be tagged with version name (e.g. v1.2.4). gm Golden master Contai…