From 76aed6ef732de38d82245b3d674f70bab30221e5 Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Fri, 3 Jul 2015 22:31:49 -0400 Subject: Fuck it, serve the files directly. --- .html/dev/twigs.html | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 .html/dev/twigs.html (limited to '.html/dev/twigs.html') diff --git a/.html/dev/twigs.html b/.html/dev/twigs.html new file mode 100644 index 0000000..66f5e97 --- /dev/null +++ b/.html/dev/twigs.html @@ -0,0 +1,112 @@ + + + + + The Codex » + Branches and Twigs + + + + + + + + +
+ + + + + +
+

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
    • +
+
+ + + +
+
+ + +comments powered by Disqus +
+ + + + + +
+ + \ No newline at end of file -- cgit v1.2.3