-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitBranching.html
568 lines (441 loc) · 13.1 KB
/
gitBranching.html
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
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<title>Git Branching</title>
<meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
<meta name="title" content="Git Branching"/>
<meta name="generator" content="Org-mode"/>
<meta name="generated" content="2014-08-25T18:39-0400"/>
<meta name="author" content="pawel"/>
<meta name="description" content=""/>
<meta name="keywords" content=""/>
<style type="text/css">
<!--/*--><![CDATA[/*><!--*/
html { font-family: Times, serif; font-size: 12pt; }
.title { text-align: center; }
.todo { color: red; }
.done { color: green; }
.tag { background-color: #add8e6; font-weight:normal }
.target { }
.timestamp { color: #bebebe; }
.timestamp-kwd { color: #5f9ea0; }
.right {margin-left:auto; margin-right:0px; text-align:right;}
.left {margin-left:0px; margin-right:auto; text-align:left;}
.center {margin-left:auto; margin-right:auto; text-align:center;}
p.verse { margin-left: 3% }
pre {
border: 1pt solid #AEBDCC;
background-color: #F3F5F7;
padding: 5pt;
font-family: courier, monospace;
font-size: 90%;
overflow:auto;
}
table { border-collapse: collapse; }
td, th { vertical-align: top; }
th.right { text-align:center; }
th.left { text-align:center; }
th.center { text-align:center; }
td.right { text-align:right; }
td.left { text-align:left; }
td.center { text-align:center; }
dt { font-weight: bold; }
div.figure { padding: 0.5em; }
div.figure p { text-align: center; }
div.inlinetask {
padding:10px;
border:2px solid gray;
margin:10px;
background: #ffffcc;
}
textarea { overflow-x: auto; }
.linenr { font-size:smaller }
.code-highlighted {background-color:#ffff00;}
.org-info-js_info-navigation { border-style:none; }
#org-info-js_console-label { font-size:10px; font-weight:bold;
white-space:nowrap; }
.org-info-js_search-highlight {background-color:#ffff00; color:#000000;
font-weight:bold; }
/*]]>*/-->
</style>
<script type="text/javascript">
/*
@licstart The following is the entire license notice for the
JavaScript code in this tag.
Copyright (C) 2012-2013 Free Software Foundation, Inc.
The JavaScript code in this tag is free software: you can
redistribute it and/or modify it under the terms of the GNU
General Public License (GNU GPL) as published by the Free Software
Foundation, either version 3 of the License, or (at your option)
any later version. The code is distributed WITHOUT ANY WARRANTY;
without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
As additional permission under GNU GPL version 3 section 7, you
may distribute non-source (e.g., minimized or compacted) forms of
that code without the copy of the GNU GPL normally required by
section 4, provided you include this license notice and a URL
through which recipients can access the Corresponding Source.
@licend The above is the entire license notice
for the JavaScript code in this tag.
*/
<!--/*--><![CDATA[/*><!--*/
function CodeHighlightOn(elem, id)
{
var target = document.getElementById(id);
if(null != target) {
elem.cacheClassElem = elem.className;
elem.cacheClassTarget = target.className;
target.className = "code-highlighted";
elem.className = "code-highlighted";
}
}
function CodeHighlightOff(elem, id)
{
var target = document.getElementById(id);
if(elem.cacheClassElem)
elem.className = elem.cacheClassElem;
if(elem.cacheClassTarget)
target.className = elem.cacheClassTarget;
}
/*]]>*///-->
</script>
</head>
<body>
<div id="preamble">
</div>
<div id="content">
<h1 class="title">Git Branching</h1>
<div id="table-of-contents">
<h2>Table of Contents</h2>
<div id="text-table-of-contents">
<ul>
<li><a href="#sec-1">1 Git Branching - What a Branch Is</a>
<ul>
<li><a href="#sec-1-1">1.1 What a Branch is</a></li>
</ul>
</li>
<li><a href="#sec-2">2 Basic Branching and Merging</a>
<ul>
<li><a href="#sec-2-1">2.1 Basic Branching</a></li>
<li><a href="#sec-2-2">2.2 Basic Merging</a></li>
<li><a href="#sec-2-3">2.3 Basic Merge Conflicts</a></li>
</ul>
</li>
<li><a href="#sec-3">3 Branch Management</a>
<ul>
<li><a href="#sec-3-1">3.1 Branch Management</a></li>
</ul>
</li>
<li><a href="#sec-4">4 Branching Workflows</a>
<ul>
<li><a href="#sec-4-1">4.1 Long Running Branches</a></li>
<li><a href="#sec-4-2">4.2 Topic Branches</a></li>
</ul>
</li>
<li><a href="#sec-5">5 Remote Branches</a>
<ul>
<li><a href="#sec-5-1">5.1 Remote Branches</a></li>
</ul>
</li>
</ul>
</div>
</div>
<div id="outline-container-1" class="outline-2">
<h2 id="sec-1"><span class="section-number-2">1</span> Git Branching - What a Branch Is</h2>
<div class="outline-text-2" id="text-1">
</div>
<div id="outline-container-1-1" class="outline-3">
<h3 id="sec-1-1"><span class="section-number-3">1.1</span> What a Branch is</h3>
<div class="outline-text-3" id="text-1-1">
<ul>
<li>When you stage files, git will checksum each file, store that
version of the file in the git repository, and add the checksum to
the <a href="gettingStarted.html">staging area</a>
</li>
<li>When you commit, git will
<ol>
<li>checksum all project directories and store them as tree objects
in the git repository. The tree object lists the contents of
directory and specifies which files names are stored as which
blobs.
</li>
<li>create a commit object that contains metadata about the commit
(e.g. commit date, author, etc.), a pointer to a tree object
that corresponds to the root project directory, and if there is
a previous commit, a pointer to that commit object.
</li>
</ol>
</li>
<li>A branch is a movable pointer that points to a commit object
</li>
<li>The default branch is the "master" branch
</li>
<li>Everytime you commit the master branch pointer is automatically moved
forward to the latest commit
</li>
<li>To create a new branch:
</li>
</ul>
<pre class="example">git branch testing
</pre>
<ul>
<li>The above will create a new pointer "testing", which will point to
the last commit object
</li>
<li>The above command does not switch to the new branch
</li>
<li>How does git know which branch you're on?
<ul>
<li>It keeps a special pointer called "HEAD" - it points to the
branch pointer
</li>
</ul>
</li>
<li>To switch to the new branch:
</li>
</ul>
<pre class="example">git checkout testing
</pre>
<ul>
<li>The "HEAD" pointer now points to the testing pointer
</li>
<li>Now when you commit, the testing pointer will point to the new
commit object while the master pointer will point to the previous
commit
</li>
<li>When you switch back and make a new commit:
</li>
</ul>
<pre class="example">git checkout master
git commit -a -m 'a commit to master branch'
</pre>
<ul>
<li>After git checkout, two things happen:
<ol>
<li>"HEAD" points to master pointer
</li>
<li>The files in your working directory have been reverted to the
snapshot that master points to.
</li>
</ol>
</li>
<li>Once you commit, the branches diverge
</li>
<li>Creating a branch is quick and simple and therefore is encouraged
</li>
</ul>
</div>
</div>
</div>
<div id="outline-container-2" class="outline-2">
<h2 id="sec-2"><span class="section-number-2">2</span> Basic Branching and Merging</h2>
<div class="outline-text-2" id="text-2">
</div>
<div id="outline-container-2-1" class="outline-3">
<h3 id="sec-2-1"><span class="section-number-3">2.1</span> Basic Branching</h3>
<div class="outline-text-3" id="text-2-1">
<ul>
<li>An example scenario:
<ol>
<li>You have a production branch on your local system
</li>
<li>You have to work on issue 53
</li>
<li>You get a call that says you must fix a bug
</li>
<li>After the bug is fixed,
</li>
</ol>
</li>
<li>To accomplish the above in git:
</li>
<li>First create a branch and switch to it (-b flag):
</li>
</ul>
<pre class="example">git checkout -b <branchName>
git checkout -b iss53
</pre>
<ul>
<li>Now switch back to master branch, but note that if your working
directory or staging area have uncommitted changes, Git won't let
you switch
</li>
</ul>
<pre class="example">git checkout master
</pre>
<ul>
<li>The above has reset your working directory to look like the
snapshot before you branched
</li>
<li>Now create a branch to work on for the hotfix:
</li>
</ul>
<pre class="example">git checkout -b hotfix
</pre>
<ul>
<li>Once you've committed your changes to the hotfix branch, you must
merge them back to the production branch:
</li>
</ul>
<pre class="example">git checkout master
git merge hotfix
</pre>
<ul>
<li>in this case, the git merge command will move the master pointer
forward because the branch was directly upstream. This is called a
"fast forward"
</li>
<li>now you can delete the hotfix branch:
</li>
</ul>
<pre class="example">git branch -d hotfix
</pre>
<ul>
<li>switch to issue 53 branch:
</li>
</ul>
<pre class="example">git checkout iss53
</pre>
</div>
</div>
<div id="outline-container-2-2" class="outline-3">
<h3 id="sec-2-2"><span class="section-number-3">2.2</span> Basic Merging</h3>
<div class="outline-text-3" id="text-2-2">
<ul>
<li>Once you've finished working on issue 53, you have to merge it back
to the master branch:
</li>
</ul>
<pre class="example">git checkout master
git merge iss53
</pre>
<ul>
<li>Since the master and iss53 branches are not on the same stream,
they are merged using a three-way merge:
<ol>
<li>It will use the two snapshots that you want to merge plus their
common ancestor
</li>
<li>Git will create a new commit based on the merger, which master
will point to (known as a merge commit)
</li>
</ol>
</li>
<li>The new commit will have two pointers that will point to the last
commit from the previous two branches
</li>
</ul>
</div>
</div>
<div id="outline-container-2-3" class="outline-3">
<h3 id="sec-2-3"><span class="section-number-3">2.3</span> Basic Merge Conflicts</h3>
<div class="outline-text-3" id="text-2-3">
<ul>
<li>If the same file is modified from two different branches a conflict
will result if you try to merge the two branches. The merge will
fail.
</li>
<li>git status will show you conflicts
</li>
<li>The conflicting files will have standard conflict markers
</li>
<li>Once the conflicts have been resolved, you use git commit to
finalize the merge commit
</li>
</ul>
</div>
</div>
</div>
<div id="outline-container-3" class="outline-2">
<h2 id="sec-3"><span class="section-number-2">3</span> Branch Management</h2>
<div class="outline-text-2" id="text-3">
</div>
<div id="outline-container-3-1" class="outline-3">
<h3 id="sec-3-1"><span class="section-number-3">3.1</span> Branch Management</h3>
<div class="outline-text-3" id="text-3-1">
<ul>
<li>To list branches:
</li>
</ul>
<pre class="example">git branch
</pre>
<ul>
<li>The star character next to the branch listings indicated the
current branch
</li>
<li>To see last commit on each branch:
</li>
</ul>
<pre class="example">git branch -v
</pre>
<ul>
<li>To see branches that are merged/not-merged into your current branch:
</li>
</ul>
<pre class="example">git branch --merged
git branch --no-merged
</pre>
<ul>
<li>You can't delete a branch that is not merged. Unless you specify
the -D flag
</li>
</ul>
</div>
</div>
</div>
<div id="outline-container-4" class="outline-2">
<h2 id="sec-4"><span class="section-number-2">4</span> Branching Workflows</h2>
<div class="outline-text-2" id="text-4">
</div>
<div id="outline-container-4-1" class="outline-3">
<h3 id="sec-4-1"><span class="section-number-3">4.1</span> Long Running Branches</h3>
<div class="outline-text-3" id="text-4-1">
<ul>
<li>One possible workflow is to have multiple branches.
</li>
<li>One branch is the stable branch - ready for release
</li>
<li>The next branch is unstable and the branch after it is even more
unstable
</li>
<li>As you develop, you merge the less stable merges with the more
stable branches
</li>
<li>Useful for complex projects
</li>
</ul>
</div>
</div>
<div id="outline-container-4-2" class="outline-3">
<h3 id="sec-4-2"><span class="section-number-3">4.2</span> Topic Branches</h3>
<div class="outline-text-3" id="text-4-2">
<ul>
<li>A short lived branch useful for one particular feature.
</li>
<li>See example above with iss53
</li>
</ul>
</div>
</div>
</div>
<div id="outline-container-5" class="outline-2">
<h2 id="sec-5"><span class="section-number-2">5</span> Remote Branches</h2>
<div class="outline-text-2" id="text-5">
</div>
<div id="outline-container-5-1" class="outline-3">
<h3 id="sec-5-1"><span class="section-number-3">5.1</span> Remote Branches</h3>
<div class="outline-text-3" id="text-5-1">
</div>
</div>
</div>
</div>
<div id="postamble">
<p class="date">Date: 2014-08-25T18:39-0400</p>
<p class="author">Author: pawel</p>
<p class="creator"><a href="http://orgmode.org">Org</a> version 7.9.3f with <a href="http://www.gnu.org/software/emacs/">Emacs</a> version 24</p>
<a href="http://validator.w3.org/check?uri=referer">Validate XHTML 1.0</a>
</div>
</body>
</html>