via nvie.com.

Great post on real-world branching conventions for Git, including when to create branches for development, and when to merge them.

The comments have some great tips about when to use “git rebase” rather than “git merge –no-ff” in the workflow.

Hat-tip to @mk2s for sharing this!