-
Notifications
You must be signed in to change notification settings - Fork 6
/
branch_exercise.html
executable file
·48 lines (41 loc) · 2.81 KB
/
branch_exercise.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
<!DOCTYPE html>
<html>
<head>
<title>Branching & Merging Exercise</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="../common/css/bootstrap.min.css">
</head>
<body>
<div class="container">
<h1>Exercise: Branches!</h1>
<p>In this exercise, you will adding new features to your pet adoption website. You will be adding a gallery page, and if there is time, a contact page.</p>
<h4 style="margin-top: 30px;">As you read through these steps, think about when would be a good time to <span style="color: purple">commit</span>. As you execute the steps, <span style="color: purple">YOU</span> get to decide when to commit.</span></h4>
<h4>1. Set up</h4>
<ol>
<li>Switch back to your project folder with your pet adoption website.</li>
<li>Use git status to double check to make sure you have no modified/uncommitted changes</li>
<li>Use git branch to double check what branch you are on (it should be master!)</li>
</ol>
<h4>2. Gallery Page</h4>
<ol>
<li>Create a new branch named gallery-feature and switch over to it</li>
<li>Add a gallery.html. If you don't want to write a bunch of html and text, you can just copy the contents of this file: <a href="./exercise-sample-code/gallery.html" download="gallery.html">gallery.html</a></li>
<li>Add some more images to your images folder. If you have time, create some image tags inside of gallery.html and include the images from the images folder.</li>
<li>Anything else you can think of that would work well on a gallery page</li>
<li>At this point you should have at least one or more commits on your gallery branch (use git log to double check!)</li>
<li>When you have determined your feature done, merge your feature branch into master</li>
<li>Once merged, make sure to delete your feature branch</li>
</ol>
<h4>3. Contact Page</h4>
<ol>
<li>Create a new branch named and switch over to it contact-feature</li>
<li>Add a contact.html. You can copy the contents of this page: <a href="./exercise-sample-code/contact.html" download="contact.html">contact.html</a></li>
<li>Add anything else you think would make sense</li>
<li>Once your feature is done (you should have at least one commit on this branch!), merge your feature branch into master</li>
<li>Once merged, make sure to delete your feature branch</li>
</ol>
<h4 style="margin-top: 30px;"> Don't forget to run <span class="green" style="font-family: monospace;">git status</span> regularly so that you can see what is happening at each stage!</h4>
</div>
</body>
</html>