Imported notes about branches/twigs

1 files changed, 24 insertions, 0 deletions

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