blob: 66f5e97d445f30ce8b7bb147217765cc5b73b878 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
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>
|
