From 3ea9f16c84395a7c7a0164a581adaca639590859 Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Thu, 3 Jan 2013 21:09:11 -0500 Subject: Imported notes about branches/twigs --- wiki/dev/twigs.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 wiki/dev/twigs.md (limited to 'wiki/dev/twigs.md') diff --git a/wiki/dev/twigs.md b/wiki/dev/twigs.md new file mode 100644 index 0000000..ebc875c --- /dev/null +++ b/wiki/dev/twigs.md @@ -0,0 +1,24 @@ +# Branches and Twigs + +## Twigs + +* Relatively short-lived +* Share the commit policy of their parent branch +* Gain little value from global names +* Examples: most "topic branches" are twigs + +## Branches + +* Relatively long-lived +* Correspond to differences in commit policy +* Gain lots of value from global names +* Examples: git-flow 'master', 'develop', &c; hg 'stable' vs 'default'; + release branches + +## Commit policy + +* Decisions like "should every commit pass tests?" and "is rewriting or + deleting a commit acceptable?" are, collectively, the policy of a branch +* Can be very formal or even tool-enforced, or ad-hoc and fluid +* Shared understanding of commit policy helps get everyone's expectations + lined up, easing other SCM-mediated conversations -- cgit v1.2.3