From f82d259e7bda843fb63ac1a0f6ff1d6bfb187099 Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Wed, 9 Dec 2015 20:40:42 -0500 Subject: Remove HTML from the project. (We're no longer using Dokku.) --- .html/dev/twigs.html | 112 --------------------------------------------------- 1 file changed, 112 deletions(-) delete mode 100644 .html/dev/twigs.html (limited to '.html/dev/twigs.html') diff --git a/.html/dev/twigs.html b/.html/dev/twigs.html deleted file mode 100644 index 66f5e97..0000000 --- a/.html/dev/twigs.html +++ /dev/null @@ -1,112 +0,0 @@ - - - - - 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