Using Git

Summary

• Use branches locally as you see fit. Creating "topic branches" is a good idea
• When merging your topic branch into your local master prior to pushing to Github, use git merge -no-ff topic_branch. This ensures that the topic branch commit is easy to identify in the history
• Always push to a "trunk" in Github. For now, for us, the trunk branch is "master"
• Create a branch for each released version if necessary, in other words, if you need to fix something in the production release prior to the next planned release
• Bugs are fixed in trunk, and then cherry picked to release branches, if any
• Push to Heroku manually from the current release branch in Github. Investigate one of the more automated models for deployment, which may have the advantage of making it harder to do wrong

Reading

Here are a couple of interesting things to ready:

• Trunk Based Development
• Git branching workflow