Skip to content

Instantly share code, notes, and snippets.

@jbenet
jbenet / simple-git-branching-model.md
Last active November 9, 2024 04:55
a simple git branching model

a simple git branching model (written in 2013)

This is a very simple git workflow. It (and variants) is in use by many people. I settled on it after using it very effectively at Athena. GitHub does something similar; Zach Holman mentioned it in this talk.

Update: Woah, thanks for all the attention. Didn't expect this simple rant to get popular.

Jul 07, 14:01:23  seacreature: I will be starting in 2 minutes, but please say hi now and mention your city :)

Jul 07, 14:01:24  locks: or we'd have the sessions up and running

Jul 07, 14:01:29  chrisdinn: JOINED

Jul 07, 14:01:56  locks: hello, I'm ricardo from Porto, Portugal

Jul 07, 14:02:03  chastell: hi, this is Piotr from Warsaw, Poland