diff options
Diffstat (limited to '.html/dev/twigs.html')
| -rw-r--r-- | .html/dev/twigs.html | 112 |
1 files changed, 112 insertions, 0 deletions
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 @@ +<!DOCTYPE html> +<html> +<head> + <title> + The Codex » + Branches and Twigs + </title> + + <link + rel='stylesheet' + type='text/css' + href='http://fonts.googleapis.com/css?family=Buenard:400,700&subset=latin,latin-ext'> + <link + rel="stylesheet" + type="text/css" + href="../media/css/reset.css"> + <link + rel="stylesheet" + type="text/css" + href="../media/css/grimoire.css"> +</head> +<body> + +<div id="shell"> + + <ol id="breadcrumbs"> + + <li class="crumb-0 not-last"> + + <a href="../">index</a> + + </li> + + <li class="crumb-1 not-last"> + + <a href="./">dev</a> + + </li> + + <li class="crumb-2 last"> + + twigs + + </li> + + </ol> + + + + <div id="article"> + <h1 id="branches-and-twigs">Branches and Twigs</h1> +<h2 id="twigs">Twigs</h2> +<ul> +<li>Relatively short-lived</li> +<li>Share the commit policy of their parent branch</li> +<li>Gain little value from global names</li> +<li>Examples: most “topic branches” are twigs</li> +</ul> +<h2 id="branches">Branches</h2> +<ul> +<li>Relatively long-lived</li> +<li>Correspond to differences in commit policy</li> +<li>Gain lots of value from global names</li> +<li>Examples: git-flow 'master', 'develop', &c; hg 'stable' vs 'default'; + release branches</li> +</ul> +<h2 id="commit-policy">Commit policy</h2> +<ul> +<li>Decisions like “should every commit pass tests?” and “is rewriting or + deleting a commit acceptable?” are, collectively, the policy of a branch</li> +<li>Can be very formal or even tool-enforced, or ad-hoc and fluid</li> +<li>Shared understanding of commit policy helps get everyone's expectations + lined up, easing other SCM-mediated conversations</li> +</ul> + </div> + + + +<div id="comments"> +<div id="disqus_thread"></div> +<script type="text/javascript"> + /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ + var disqus_shortname = 'grimoire'; // required: replace example with your forum shortname + + /* * * DON'T EDIT BELOW THIS LINE * * */ + (function() { + var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; + dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; + (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); + })(); +</script> +<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript> +<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a> +</div> + + + + <div id="footer"> + <p> + + The Codex — + + Powered by <a href="http://markdoc.org/">Markdoc</a>. + +<a href="https://bitbucket.org/ojacobson/grimoire.ca/src/master/wiki/dev/twigs.md">See this page on Bitbucket</a> (<a href="https://bitbucket.org/ojacobson/grimoire.ca/history-node/master/wiki/dev/twigs.md">history</a>). + + </p> + </div> + +</div> +</body> +</html>
\ No newline at end of file |