forked from nicoespeon/gitgraph.js
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitFlowDevModel.html
More file actions
69 lines (57 loc) · 2 KB
/
gitFlowDevModel.html
File metadata and controls
69 lines (57 loc) · 2 KB
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
<!DOCTYPE html>
<html>
<head>
<link href="https://cdnjs.cloudflare.com/ajax/libs/gitgraph.js/1.11.4/gitgraph.css" rel="stylesheet">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui">
</head>
<body>
<p style="margin: 20px"></p>
<canvas id="gitGraph" style="padding: 20px"></canvas>
<script src="https://cdnjs.cloudflare.com/ajax/libs/gitgraph.js/1.11.4/gitgraph.js"></script>
<script src="gitFlowDevModel.js"></script>
</body>
<p style="page-break-before: always">
<h2> Notes</h2>
<ul>
<li>Feature branches branch off of
<b><i>develop</i></b>
& merge back into
<b><i>develop</i></b>
</li>
<li>Release branches branch off of
<b><i>develop</i></b>
& merge back into
<b><i>develop</i></b> and
<b><i>master</i></b>
</li>
<li>Hotfix branches off of
<b><i>master</i></b>
& after critical bug fixes merge back into
<b><i>develop</i></b> and
<b><i>master</i></b>
</li>
</ul>
<h2> Pros</h2>
<ul>
<li>Git flow model used by open source projects and other firms.</li>
<li>Has been trending well last few years.</li>
<li>origin/master would be the main branch where the source code of HEAD always reflects a production-ready state.</li>
<li>origin/develop would be the main branch where source code of HEAD always reflects a state with latest delivered development changes for next release. aka “integration branch” or "nightly build branch"</li>
</ul>
<h2> Cons</h2>
<ul>
<li>Requires more effort since it involves maintaining more branches and merges may not be smooth.</li>
<li>Might be overkill if code base does not change often or less available resources.</li>
<li>Might be problematic if release cycles are long and same mature code base is changed/refactored extensively between releases along with personnel turnover.</li>
</ul>
<p></p>
<button onclick="myFunction()">Print</button>
<script>
function myFunction() {
window.print();
}
</script>
<br>
<br>
<br>
</html>