-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathTutorial.html
More file actions
657 lines (582 loc) · 22.6 KB
/
Tutorial.html
File metadata and controls
657 lines (582 loc) · 22.6 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
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
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
<!DOCTYPE html>
<html>
<head>
<title>Tutorial.md</title>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
<style>
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
body {
font-family: "Segoe WPC", "Segoe UI", "SFUIText-Light", "HelveticaNeue-Light", sans-serif, "Droid Sans Fallback";
font-size: 14px;
padding: 0 12px;
line-height: 22px;
word-wrap: break-word;
}
#code-csp-warning {
position: fixed;
top: 0;
right: 0;
color: white;
margin: 16px;
text-align: center;
font-size: 12px;
font-family: sans-serif;
background-color:#444444;
cursor: pointer;
padding: 6px;
box-shadow: 1px 1px 1px rgba(0,0,0,.25);
}
#code-csp-warning:hover {
text-decoration: none;
background-color:#007acc;
box-shadow: 2px 2px 2px rgba(0,0,0,.25);
}
body.scrollBeyondLastLine {
margin-bottom: calc(100vh - 22px);
}
body.showEditorSelection .code-line {
position: relative;
}
body.showEditorSelection .code-active-line:before,
body.showEditorSelection .code-line:hover:before {
content: "";
display: block;
position: absolute;
top: 0;
left: -12px;
height: 100%;
}
body.showEditorSelection li.code-active-line:before,
body.showEditorSelection li.code-line:hover:before {
left: -30px;
}
.vscode-light.showEditorSelection .code-active-line:before {
border-left: 3px solid rgba(0, 0, 0, 0.15);
}
.vscode-light.showEditorSelection .code-line:hover:before {
border-left: 3px solid rgba(0, 0, 0, 0.40);
}
.vscode-dark.showEditorSelection .code-active-line:before {
border-left: 3px solid rgba(255, 255, 255, 0.4);
}
.vscode-dark.showEditorSelection .code-line:hover:before {
border-left: 3px solid rgba(255, 255, 255, 0.60);
}
.vscode-high-contrast.showEditorSelection .code-active-line:before {
border-left: 3px solid rgba(255, 160, 0, 0.7);
}
.vscode-high-contrast.showEditorSelection .code-line:hover:before {
border-left: 3px solid rgba(255, 160, 0, 1);
}
img {
max-width: 100%;
max-height: 100%;
}
a {
color: #4080D0;
text-decoration: none;
}
a:focus,
input:focus,
select:focus,
textarea:focus {
outline: 1px solid -webkit-focus-ring-color;
outline-offset: -1px;
}
hr {
border: 0;
height: 2px;
border-bottom: 2px solid;
}
h1 {
padding-bottom: 0.3em;
line-height: 1.2;
border-bottom-width: 1px;
border-bottom-style: solid;
}
h1, h2, h3 {
font-weight: normal;
}
h1 code,
h2 code,
h3 code,
h4 code,
h5 code,
h6 code {
font-size: inherit;
line-height: auto;
}
a:hover {
color: #4080D0;
text-decoration: underline;
}
table {
border-collapse: collapse;
}
table > thead > tr > th {
text-align: left;
border-bottom: 1px solid;
}
table > thead > tr > th,
table > thead > tr > td,
table > tbody > tr > th,
table > tbody > tr > td {
padding: 5px 10px;
}
table > tbody > tr + tr > td {
border-top: 1px solid;
}
blockquote {
margin: 0 7px 0 5px;
padding: 0 16px 0 10px;
border-left: 5px solid;
}
code {
font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Courier New", monospace, "Droid Sans Fallback";
font-size: 14px;
line-height: 19px;
}
body.wordWrap pre {
white-space: pre-wrap;
}
.mac code {
font-size: 12px;
line-height: 18px;
}
pre:not(.hljs),
pre.hljs code > div {
padding: 16px;
border-radius: 3px;
overflow: auto;
}
/** Theming */
.vscode-light,
.vscode-light pre code {
color: rgb(30, 30, 30);
}
.vscode-dark,
.vscode-dark pre code {
color: #DDD;
}
.vscode-high-contrast,
.vscode-high-contrast pre code {
color: white;
}
.vscode-light code {
color: #A31515;
}
.vscode-dark code {
color: #D7BA7D;
}
.vscode-light pre:not(.hljs),
.vscode-light code > div {
background-color: rgba(220, 220, 220, 0.4);
}
.vscode-dark pre:not(.hljs),
.vscode-dark code > div {
background-color: rgba(10, 10, 10, 0.4);
}
.vscode-high-contrast pre:not(.hljs),
.vscode-high-contrast code > div {
background-color: rgb(0, 0, 0);
}
.vscode-high-contrast h1 {
border-color: rgb(0, 0, 0);
}
.vscode-light table > thead > tr > th {
border-color: rgba(0, 0, 0, 0.69);
}
.vscode-dark table > thead > tr > th {
border-color: rgba(255, 255, 255, 0.69);
}
.vscode-light h1,
.vscode-light hr,
.vscode-light table > tbody > tr + tr > td {
border-color: rgba(0, 0, 0, 0.18);
}
.vscode-dark h1,
.vscode-dark hr,
.vscode-dark table > tbody > tr + tr > td {
border-color: rgba(255, 255, 255, 0.18);
}
.vscode-light blockquote,
.vscode-dark blockquote {
background: rgba(127, 127, 127, 0.1);
border-color: rgba(0, 122, 204, 0.5);
}
.vscode-high-contrast blockquote {
background: transparent;
border-color: #fff;
}
</style>
<style>
/* Tomorrow Theme */
/* http://jmblog.github.com/color-themes-for-google-code-highlightjs */
/* Original theme - https://github.com/chriskempson/tomorrow-theme */
/* Tomorrow Comment */
.hljs-comment,
.hljs-quote {
color: #8e908c;
}
/* Tomorrow Red */
.hljs-variable,
.hljs-template-variable,
.hljs-tag,
.hljs-name,
.hljs-selector-id,
.hljs-selector-class,
.hljs-regexp,
.hljs-deletion {
color: #c82829;
}
/* Tomorrow Orange */
.hljs-number,
.hljs-built_in,
.hljs-builtin-name,
.hljs-literal,
.hljs-type,
.hljs-params,
.hljs-meta,
.hljs-link {
color: #f5871f;
}
/* Tomorrow Yellow */
.hljs-attribute {
color: #eab700;
}
/* Tomorrow Green */
.hljs-string,
.hljs-symbol,
.hljs-bullet,
.hljs-addition {
color: #718c00;
}
/* Tomorrow Blue */
.hljs-title,
.hljs-section {
color: #4271ae;
}
/* Tomorrow Purple */
.hljs-keyword,
.hljs-selector-tag {
color: #8959a8;
}
.hljs {
display: block;
overflow-x: auto;
color: #4d4d4c;
padding: 0.5em;
}
.hljs-emphasis {
font-style: italic;
}
.hljs-strong {
font-weight: bold;
}
</style>
<style>
/*
* Markdown PDF CSS
*/
body {
font-family: "Meiryo", "Segoe WPC", "Segoe UI", "SFUIText-Light", "HelveticaNeue-Light", sans-serif, "Droid Sans Fallback";
}
pre {
background-color: #f8f8f8;
border: 1px solid #cccccc;
border-radius: 3px;
overflow-x: auto;
white-space: pre-wrap;
overflow-wrap: break-word;
}
pre:not(.hljs) {
padding: 23px;
line-height: 19px;
}
blockquote {
background: rgba(127, 127, 127, 0.1);
border-color: rgba(0, 122, 204, 0.5);
}
.emoji {
height: 1.4em;
}
/* for inline code */
:not(pre):not(.hljs) > code {
color: #C9AE75; /* Change the old color so it seems less like an error */
font-size: inherit;
}
/* Page Break : use <div class="page"/> to insert page break
-------------------------------------------------------- */
.page {
page-break-after: always;
}
</style>
</head>
<body>
<h1 id="comp-2406---winter-2019-going-into-depth-with-git">COMP 2406 - Winter 2019 Going into depth with Git</h1>
<h2 id="introduction-to-git-features-such-as-branches-pull-requests-merge-conflicts">Introduction to Git features such as branches, pull requests & merge conflicts.</h2>
<p>© Omar Garcia Flores, Jason Le, & L.D. Nel 2019.</p>
<p>Revisions:</p>
<hr>
<ul>
<li><a href="#comp-2406---winter-2019-going-into-depth-with-git">COMP 2406 - Winter 2019 Going into depth with Git</a>
<ul>
<li><a href="#introduction-to-git-features-such-as-branches-pull-requests--merge-conflicts">Introduction to Git features such as branches, pull requests & merge conflicts.</a></li>
<li><a href="#description">Description</a></li>
<li><a href="#overview">Overview</a></li>
<li><a href="#instructions">Instructions</a></li>
</ul>
</li>
<li><a href="#part-a---setup">Part A - Setup</a>
<ul>
<li><a href="#step-1-fork-the-given-github-base-code-repository-into-your-own-repository">Step 1, Fork the given GitHub base code repository into your own repository</a></li>
<li><a href="#step-2-add-other-collaborators-max-4-people">Step 2, Add other collaborators (Max 4 people)</a></li>
<li><a href="#step-3-clone-the-repository-locally">Step 3, Clone the repository locally</a></li>
<li><a href="#step-4-generate-branches-one-per-team-member">Step 4, Generate branches (One per team member)</a></li>
</ul>
</li>
<li><a href="#part-b---creating-a-page-and-pushing-it-using-a-pull-request">Part B - Creating a Page and Pushing it using a Pull Request</a>
<ul>
<li><a href="#step-1-create-individual-pages">Step 1, Create individual pages</a></li>
<li><a href="#step-2-pushing-code-changes">Step 2, Pushing code changes</a></li>
<li><a href="#step-3-merge-branches-by-creating-a-pull-request-one-per-branch">Step 3 Merge branches by creating a pull request (One per branch)</a></li>
<li><a href="#note">Note</a></li>
</ul>
</li>
<li><a href="#part-c---merge-conflicts-modifying-indexjade">Part C - Merge Conflicts (modifying <code>index.jade</code>)</a>
<ul>
<li><a href="#step-1-pull-the-changes-from-part-b">Step 1, Pull the changes from Part B</a></li>
<li><a href="#step-2-make-the-following-changes-to-the-base-code-depending-on-the-size-of-your-team">Step 2, make the following changes to the base code depending on the size of your team</a></li>
<li><a href="#step-3-pushing-code-changes">Step 3, Pushing code changes</a></li>
<li><a href="#step-4-create-a-pull-request">Step 4, Create a pull request</a></li>
<li><a href="#note-all-team-members-must-follow-each-step-one-member-at-a-time">Note: <strong>All team members must follow each step, one member at a time.</strong></a></li>
<li><a href="#step-5-dealing-with-merge-conflicts">Step 5, Dealing with Merge Conflicts</a></li>
</ul>
</li>
<li><a href="#suggested-exercises">Suggested Exercises</a>
<ul>
<li><a href="#optional-liveshares">(Optional) Liveshares</a></li>
<li><a href="#vscode-liveshare">VSCode Liveshare</a></li>
<li><a href="#atom-teletype">Atom Teletype</a></li>
</ul>
</li>
</ul>
<hr>
<h2 id="description">Description</h2>
<p>The purpose of this tutorial is for you and a team of at least 1 other student with work with a given Git repository, make some modifications and deal with some of the most common features such as creating a working branch, pull requests and dealing with merge conflicts.</p>
<p>As background for this tutorial it is recommended that you look over the Git documentation in the following website https://guides.github.com/introduction/git-handbook/</p>
<p>To learn more about version control software and Git, refer to the following website: https://git-scm.com/about</p>
<p>Tutorial grading: 0, 1, or 2 marks. 0 marks for no show or no progress. 1 mark for partial completion, and 2 marks for completing all or most of the tutorial. Important: tutorials are meant to be started as homework. You will not generally be able to finish a tutorial if you only start it at the tutorial session.</p>
<hr>
<h2 id="overview">Overview</h2>
<p>In this tutorial you will fork a <strong>Github Repository</strong> and work on the project with other students.</p>
<hr>
<h2 id="instructions">Instructions</h2>
<ul>
<li>
<p>This tutorial will require you to <strong>already</strong> have set up your ssh key with your github account. If you haven't finished such requirement, <strong>you must complete part 2 of Tutorial 6.</strong></p>
</li>
<li>
<p>You will need to form teams of <strong>2 to 4</strong> people.</p>
</li>
</ul>
<hr>
<h1 id="part-a---setup">Part A - Setup</h1>
<h2 id="step-1-fork-the-given-github-base-code-repository-into-your-own-repository">Step 1, Fork the given GitHub base code repository into your own repository</h2>
<p>Sign into <a href="https://github.com">https://github.com</a></p>
<p>Only one team member must visit https://github.com/2406-ta-team/comp2406-git-tutorial-base-code-FORK-ME and fork the repository by clicking on the fork button</p>
<p><img src="images/fork.png" alt="fork_me.jpeg"></p>
<h2 id="step-2-add-other-collaborators-max-4-people">Step 2, Add other collaborators (Max 4 people)</h2>
<p><strong>Note: only one person needs to add all the collaborators</strong></p>
<p>Head to your projects' settings</p>
<p>Click on the Collaborators tab on the left hand bar and then enter the GitHub usernames of your team members. Click on 'Add Collaborator' once the correct username is selected.</p>
<p><img src="images/add_collabs.png" alt="add_collabs.jpeg"></p>
<h2 id="step-3-clone-the-repository-locally">Step 3, Clone the repository locally</h2>
<p><strong>Note: Everyone in the team must perform the following steps individually</strong></p>
<p>Navigate to your GitHub projects folder using your <em>terminal</em></p>
<p>Get the URL for the forked repository under the green <code>Clone or Download</code> button</p>
<pre class="hljs"><code><div>git <span class="hljs-built_in">clone</span> <URL>
</div></code></pre>
<h2 id="step-4-generate-branches-one-per-team-member">Step 4, Generate branches (One per team member)</h2>
<p>Create seperate for branches for each team member within the folder,
ach branch <strong>MUST</strong> have a unique name</p>
<pre class="hljs"><code><div><span class="hljs-built_in">cd</span> comp2406-git-tutorial-base-code
git checkout -b <NAME OF YOUR BRANCH>
</div></code></pre>
<blockquote>
<p><em>Example</em></p>
<pre class="hljs"><code><div>git checkout -b louDNel
</div></code></pre>
</blockquote>
<blockquote>
<p><em>Notes</em>:</p>
<p>Specifying the <code>-b</code> flag on the <code>git checkout</code> command specifies <em>git</em> to create a new branch if it doesn't exist</p>
<p>We can also switch branches by using the following command <code>git checkout [NAME OF YOUR BRANCH]</code></p>
<p>Branches are case sensitive</p>
</blockquote>
<p><img src="images/branches.png" alt="branches.jpeg"></p>
<h1 id="part-b---creating-a-page-and-pushing-it-using-a-pull-request">Part B - Creating a Page and Pushing it using a Pull Request</h1>
<h2 id="step-1-create-individual-pages">Step 1, Create individual pages</h2>
<p>Each tem member must create their own page with the filename <code>LouDNel.jade</code> (changing LouDNel to your name) inside of <code>/views</code> folder with the following contents (changing <code>Lou D Nel</code> with your name)</p>
<p><em>Example</em>
<code>/views/LouDNel.jade</code></p>
<pre class="hljs"><code><div>extends layout
block content
h1= title
p Hi! My name is Lou D Nel
</div></code></pre>
<p>After creating the pages we must track them and add them to the origin repository by following the next steps.</p>
<hr>
<h2 id="step-2-pushing-code-changes">Step 2, Pushing code changes</h2>
<p>Note that since we are using different branches, we will need to use a slightly modified command to push</p>
<p>Each person will have to push their code changes to their respective branches using the following commands (replacing <code>[SOME USEFUL COMMIT MESSAGE]</code> with the approrpiate text)</p>
<pre class="hljs"><code><div>git add -A
git commit -m <span class="hljs-string">"SOME USEFUL COMMIT MESSAGE"</span>
git push origin <NAME OF YOUR BRANCH>
</div></code></pre>
<blockquote>
<p><em>Example</em></p>
<pre class="hljs"><code><div>git add -A
git commit -m "Added LouDNel's personal Page"
git push origin louDNel
</div></code></pre>
</blockquote>
<blockquote>
<p><em>Notes</em></p>
<p>We need to specify the <code>origin</code> location on this push because git will automatically name the <em>remote</em> (that exist on <em>github</em>) <em>origin</em></p>
</blockquote>
<p>Now on Github you should see all of the team members branches under the branch tab.</p>
<p>The TA may request you to show them the branches on Github.</p>
<hr>
<h2 id="step-3-merge-branches-by-creating-a-pull-request-one-per-branch">Step 3 Merge branches by creating a pull request (One per branch)</h2>
<p>After having succesfully pushed all the different branches onto GiHub, we will create a pull request per branch.</p>
<p>Each team member must follow the following steps to create a pull request:</p>
<ul>
<li>Select the <code>Compare & Pull Request</code></li>
</ul>
<p><img src="images/create_pull_request_pA.jpeg" alt="images/create_pull_request_pA.jpeg"></p>
<ul>
<li>Alternatively, if the <code>Compare & Pull Request</code> button do not appear, you can create one by clicking on the</li>
</ul>
<p><img src="images/alternative_pull_request.png" alt="images/alternative_pull_request.png"></p>
<ul>
<li>make sure that the <code>base: master</code> branch is selected</li>
</ul>
<p><img src="images/right_base.png" alt="images/right_base.png"></p>
<ul>
<li>Select the <code>Create Pull Request</code> to create the pull request</li>
</ul>
<blockquote>
<p><em>Note:</em></p>
<p>A <strong>pull request</strong> is way for someone to submit a code change to a repository. Instead of pushing directly to the <code>master</code> branch it's better to create <em>pull request</em> so it doesn't affect the main code immediately.</p>
</blockquote>
<h2 id="note">Note</h2>
<p><strong>DO NOT</strong> delete your branch once your pull request was succesfully merged onto the master branch.</p>
<hr>
<h1 id="part-c---merge-conflicts-modifying-indexjade">Part C - Merge Conflicts (modifying <code>index.jade</code>)</h1>
<h2 id="step-1-pull-the-changes-from-part-b">Step 1, Pull the changes from Part B</h2>
<p>You must now pull all the changes that were made into your current branch by entering the following command:</p>
<pre class="hljs"><code><div>git pull origin <NAME OF YOUR BRANCH>
</div></code></pre>
<hr>
<h2 id="step-2-make-the-following-changes-to-the-base-code-depending-on-the-size-of-your-team">Step 2, make the following changes to the base code depending on the size of your team</h2>
<p>One at a time, each person create a pull request from their branch to the <code>master</code> branch</p>
<p>Each person should <strong>INDIVIDUALLY</strong> modify the <code>index.jade</code> file (in the <code>views</code> folder) and change the text from</p>
<pre class="hljs"><code><div>Congrats! Now go back to the tutorial
</div></code></pre>
<p>to something else (keep it unique, everyone should have different text)</p>
<p>For example, your file should look something like this after
<code>index.jade</code></p>
<pre class="hljs"><code><div>extends layout
block content
h1= title
p COMP 2406 is the best course!
</div></code></pre>
<p>Each person, one at a time must now add the changes to the repository.</p>
<hr>
<h2 id="step-3-pushing-code-changes">Step 3, Pushing code changes</h2>
<p>Note that since we are using different branches, we will need to use a slightly modified command to push</p>
<p>Each person will have to push their code changes to their respective branches using the following commands (replacing <code>[STUFF]</code> with the approrpiate text)</p>
<pre class="hljs"><code><div>git add -A
git commit -m <span class="hljs-string">"SOME USEFUL COMIT MESSAGE"</span>
git push origin <NAME OF YOUR BRANCH>
</div></code></pre>
<blockquote>
<p><em>Example</em></p>
<pre class="hljs"><code><div>git add -A
git commit -m "Modified tagline on index.jade"
git push origin louDNel
</div></code></pre>
</blockquote>
<p>We need to specify the <code>origin</code> location on this push because git will automatically name the <em>remote</em> (that exist on <em>github</em>) <em>origin</em></p>
<hr>
<h2 id="step-4-create-a-pull-request">Step 4, Create a pull request</h2>
<h2 id="note-all-team-members-must-follow-each-step-one-member-at-a-time">Note: <strong>All team members must follow each step, one member at a time.</strong></h2>
<p>Each team member must follow the following steps to create a pull request:</p>
<ul>
<li>Select the <code>Compare & Pull Request</code></li>
</ul>
<p><img src="images/create_pull_request_pA.jpeg" alt="images/create_pull_request_pA.jpeg"></p>
<blockquote>
<p><em>Note:</em></p>
<p>A <strong>pull request</strong> is way for someone to submit a code change to a repository. Instead of pushing directly to the <code>master</code> branch it's better to create <em>pull request</em> so it doesn't affect the main code immediately.</p>
</blockquote>
<hr>
<h2 id="step-5-dealing-with-merge-conflicts">Step 5, Dealing with Merge Conflicts</h2>
<p>Back on your terminal, we run the following commands to resolve the merge conflict</p>
<pre class="hljs"><code><div>git fetch origin
git checkout master
git pull
git checkout <BRANCH NAME>
git merge master
</div></code></pre>
<p>You will receive the error</p>
<pre class="hljs"><code><div>Auto-merging views/index.jade
CONFLICT (content): Merge conflict in views/index.jade
Automatic merge failed; fix conflicts and then commit the result.
</div></code></pre>
<p>and your <code>index.jade</code> should now look like</p>
<pre class="hljs"><code><div>extends layout
block content
h1= title
<<<<<<< HEAD
p I think Javascript is better than Python
=======
p Python <3
>>>>>>> master
</div></code></pre>
<p>This is a merge conflict, when two people have modified the same file and we need to combine the code together.</p>
<p>To do so, we will mesh both paragraphs together so by removing the
<code><<<<<<< HEAD</code>, <code>=======</code> and <code>>>>>>>> master</code> which are the indicators for merge conflicts.</p>
<p>At the end of it, your file should look something like this</p>
<pre class="hljs"><code><div>extends layout
block content
h1= title
p I think Javascript is better than Python
p Python <3
</div></code></pre>
<p>and now we can push the changes to master</p>
<pre class="hljs"><code><div>git add -A
git commit -m "resolved merge conflicts"
git push origin <BRANCH NAME>
git checkout master
git merge --no-ff <BRANCH NAME> -m "MESSAGE"
git push origin master
</div></code></pre>
<h1 id="suggested-exercises">Suggested Exercises</h1>
<h2 id="optional-liveshares">(Optional) Liveshares</h2>
<p>If you chose to work with a partner during the assignments, you may find it useful to work on it simultaneously. This is where liveshares are handy. They are essentially a google docs for coding</p>
<ul>
<li><a href="#vscode-liveshare">VSCode Liveshare</a></li>
<li><a href="#atom-liveshare">Atom Teletype</a></li>
</ul>
<p>These pluggins will allow you and your teammates to have real time collaboration with your code. Imagine being able to convert your current file into a Google sheets like document in which you can have many people typing at once.</p>
<h2 id="vscode-liveshare">VSCode Liveshare</h2>
<p><a href="https://marketplace.visualstudio.com/items?itemName=MS-vsliveshare.vsliveshare">https://marketplace.visualstudio.com/items?itemName=MS-vsliveshare.vsliveshare</a></p>
<h2 id="atom-teletype">Atom Teletype</h2>
<p><a href="https://teletype.atom.io/">https://teletype.atom.io/</a></p>
</body>
</html>