Skip to content

Commit 5f0b48b

Browse files
d-odumosud-odumosu
committed
feat: all pages completed and meets all requirements
1 parent e8d4e9d commit 5f0b48b

5 files changed

Lines changed: 455 additions & 364 deletions

File tree

‎Wireframe/branches.html‎

Lines changed: 121 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -31,143 +31,147 @@ <h1 class="site-title">The Blog</h1>
3131
</header>
3232

3333
<div class="container container-blog-content">
34-
<article>
35-
<header>
36-
<h2>What Is a Branch in Git?</h2>
37-
</header>
38-
39-
<p>
40-
Modern software development often involves multiple developers working on the
41-
same project simultaneously. Without a system for managing changes, code could
42-
quickly become disorganised and difficult to maintain.
43-
</p>
44-
45-
<p>
46-
Git solves this problem through version control, and one of its most powerful
47-
features is branching.
48-
</p>
49-
50-
<p>
51-
A branch in Git is a separate line of development that allows developers to
52-
work on changes independently without affecting the main project.
53-
</p>
54-
55-
<p>
56-
You can think of a branch as creating a copy of the project where changes can
57-
be made safely. Once the work is complete and tested, those changes can be
58-
merged back into the main project.
59-
</p>
60-
61-
<section>
62-
<h3>Why Branches Are Important</h3>
63-
<p>Branches provide a safe and organised way to develop software.</p>
64-
</section>
65-
66-
<section>
67-
<h3>Feature Development</h3>
34+
<main>
35+
<article>
36+
<header>
37+
<h2>What Is a Branch in Git?</h2>
38+
</header>
39+
<p>Git documentation explains that branches allow developers to diverge from the main line of development
40+
and
41+
work independently on features, fixes, or experiments before merging their changes back into the project
42+
<em>(Git SCM, n.d.).</em></p>
6843
<p>
69-
Developers often create branches when working on new features.
44+
Modern software development often involves multiple developers working on the
45+
same project simultaneously. Without a system for managing changes, code could
46+
quickly become disorganised and difficult to maintain.
7047
</p>
71-
<p><em>For example: feature-user-authentication</em></p>
72-
<p>
73-
This branch might contain all the code required to add login and
74-
registration functionality.
75-
</p>
76-
</section>
7748

78-
<section>
79-
<h3>Bug Fixes</h3>
80-
<p>
81-
Branches can also be used to fix bugs without interfering with ongoing
82-
development.
83-
</p>
84-
<p><em>For example: fix-navigation-bug</em></p>
8549
<p>
86-
Developers can work on the issue, test the solution, and merge it back
87-
into the main branch when ready.
50+
Git solves this problem through version control, and one of its most powerful
51+
features is branching.
8852
</p>
89-
</section>
9053

91-
<section>
92-
<h3>Experimentation</h3>
9354
<p>
94-
Sometimes developers want to test a new idea without risking the stability
95-
of the project. Branches provide a safe environment for experimentation.
55+
A branch in Git is a separate line of development that allows developers to
56+
work on changes independently without affecting the main project.
9657
</p>
97-
<p>
98-
If the experiment fails, the branch can simply be deleted.
99-
</p>
100-
</section>
10158

102-
<section>
103-
<h3>Common Git Branch Workflow</h3>
104-
<p>A typical Git workflow follows these steps:</p>
105-
<ul>
106-
<li>Create a new branch.</li>
107-
<li>Make changes within that branch.</li>
108-
<li>Commit changes regularly.</li>
109-
<li>Push the branch to GitHub.</li>
110-
<li>Open a Pull Request.</li>
111-
<li>Review and test the changes.</li>
112-
<li>Merge the branch into the main branch.</li>
113-
</ul>
114-
<p>
115-
This workflow helps maintain code quality and prevents accidental changes
116-
to the production version of the project.
117-
</p>
118-
</section>
119-
120-
<section>
121-
<h3>Collaboration Benefits</h3>
122-
<p>
123-
Branches are especially valuable when multiple developers work together.
124-
</p>
125-
<p>Imagine a team building an e-commerce website:</p>
126-
<ul>
127-
<li>Developer A works on the shopping cart.</li>
128-
<li>Developer B works on the product search feature.</li>
129-
<li>Developer C fixes bugs in the checkout process.</li>
130-
</ul>
131-
<p>
132-
Each developer can work on their own branch independently without
133-
disrupting anyone else's work. Once their tasks are complete, their
134-
changes can be reviewed and merged into the main branch.
135-
</p>
13659
<p>
137-
This approach improves collaboration, reduces conflicts, and allows teams
138-
to develop features simultaneously.
60+
You can think of a branch as creating a copy of the project where changes can
61+
be made safely. Once the work is complete and tested, those changes can be
62+
merged back into the main project.
13963
</p>
140-
</section>
14164

142-
<section>
143-
<h3>Branches and Professional Development</h3>
144-
<p>
145-
Branching is considered a standard industry practice. Employers expect
146-
developers to understand how branches work because they form the foundation
147-
of collaborative software development.
148-
</p>
149-
<p>
150-
Learning how to create, switch, merge, and manage branches is therefore an
151-
essential skill for anyone pursuing a career in software engineering.
152-
</p>
153-
</section>
154-
</article>
65+
<section>
66+
<h3>Why Branches Are Important</h3>
67+
<p>Branches provide a safe and organised way to develop software.</p>
68+
</section>
69+
70+
<section>
71+
<h3>Feature Development</h3>
72+
<p>
73+
Developers often create branches when working on new features.
74+
</p>
75+
<p><em>For example: feature-user-authentication</em></p>
76+
<p>
77+
This branch might contain all the code required to add login and
78+
registration functionality.
79+
</p>
80+
</section>
81+
82+
<section>
83+
<h3>Bug Fixes</h3>
84+
<p>
85+
Branches can also be used to fix bugs without interfering with ongoing
86+
development.
87+
</p>
88+
<p><em>For example: fix-navigation-bug</em></p>
89+
<p>
90+
Developers can work on the issue, test the solution, and merge it back
91+
into the main branch when ready.
92+
</p>
93+
</section>
94+
95+
<section>
96+
<h3>Experimentation</h3>
97+
<p>
98+
Sometimes developers want to test a new idea without risking the stability
99+
of the project. Branches provide a safe environment for experimentation.
100+
</p>
101+
<p>
102+
If the experiment fails, the branch can simply be deleted.
103+
</p>
104+
</section>
105+
106+
<section>
107+
<h3>Common Git Branch Workflow</h3>
108+
<p>A typical Git workflow follows these steps:</p>
109+
<ul>
110+
<li>Create a new branch.</li>
111+
<li>Make changes within that branch.</li>
112+
<li>Commit changes regularly.</li>
113+
<li>Push the branch to GitHub.</li>
114+
<li>Open a Pull Request.</li>
115+
<li>Review and test the changes.</li>
116+
<li>Merge the branch into the main branch.</li>
117+
</ul>
118+
<p>
119+
This workflow helps maintain code quality and prevents accidental changes
120+
to the production version of the project.
121+
</p>
122+
</section>
123+
124+
<section>
125+
<h3>Collaboration Benefits</h3>
126+
<p>
127+
Branches are especially valuable when multiple developers work together.
128+
</p>
129+
<p>Imagine a team building an e-commerce website:</p>
130+
<ul>
131+
<li>Developer A works on the shopping cart.</li>
132+
<li>Developer B works on the product search feature.</li>
133+
<li>Developer C fixes bugs in the checkout process.</li>
134+
</ul>
135+
<p>
136+
Each developer can work on their own branch independently without
137+
disrupting anyone else's work. Once their tasks are complete, their
138+
changes can be reviewed and merged into the main branch.
139+
</p>
140+
<p>
141+
This approach improves collaboration, reduces conflicts, and allows teams
142+
to develop features simultaneously.
143+
</p>
144+
</section>
145+
146+
<section>
147+
<h3>Branches and Professional Development</h3>
148+
<p>
149+
Branching is considered a standard industry practice. Employers expect
150+
developers to understand how branches work because they form the foundation
151+
of collaborative software development.
152+
</p>
153+
<p>
154+
Learning how to create, switch, merge, and manage branches is therefore an
155+
essential skill for anyone pursuing a career in software engineering.
156+
</p>
157+
</section>
158+
</article>
159+
</main>
155160
</div>
156161
<footer class="site-footer">
157-
158-
<div class="container">
159-
162+
<div class="container container-footer">
160163
<p>&copy; 2026 The Blog. All rights reserved.</p>
161164

162165
<nav class="footer-nav">
163-
<a href="index.html">Home</a>
164-
<a href="readme.html">README</a>
165-
<a href="wireframe.html">Wireframes</a>
166-
<a href="branches.html">Git Branches</a>
166+
<ul>
167+
<li><a href="index.html">Home</a></li>
168+
<li><a href="readme.html">README</a></li>
169+
<li><a href="wireframe.html">Wireframes</a></li>
170+
<li><a href="branches.html">Git Branches</a></li>
171+
</ul>
167172
</nav>
168173

169174
</div>
170-
171175
</footer>
172176
</body>
173177
</html>

‎Wireframe/index.html‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<meta charset="UTF-8"/>
55
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
7-
<meta name="description" content="A blog about, wireframes, git branching and readme files"/>
8-
<title>Wireframe</title>
7+
<meta name="description" content="A beginner-friendly blog about README files, wireframes, and Git branches for learning web development."/>
8+
<title>The Blog | Learning Programming Basics</title>
99
<link rel="stylesheet" href="style.css"/>
1010
</head>
1111

@@ -34,7 +34,7 @@ <h2>What is the purpose of a README file</h2>
3434
purpose is ...
3535
</p>
3636
<a class="article-read-more" href="readme.html"
37-
aria-label="read more about what the purpose of a read me file does">Read more</a>
37+
aria-label="read more about what the purpose of a read me file does">README file ...</a>
3838
</article>
3939

4040
<article class="article-sec">
@@ -44,8 +44,7 @@ <h2>What is the purpose of a wireframe</h2>
4444
A wireframe is a simple visual representation of a website or application's layout. It acts as a
4545
blueprint ...
4646
</p>
47-
<a class="article-read-more" href="wireframe.html" aria-label="read more about the purpose of a wireframe">Read
48-
more</a>
47+
<a class="article-read-more" href="wireframe.html" aria-label="read more about the purpose of a wireframe">Wireframes</a>
4948
</article>
5049

5150
<article class="article-sec">
@@ -55,20 +54,16 @@ <h2>What is a branch in Git?</h2>
5554
A branch in Git is an independent line of development that allows developers to work on changes without
5655
affecting ...
5756
</p>
58-
<a class="article-read-more" href="branches.html" aria-label="read more about branches on git">Read more</a>
57+
<a class="article-read-more" href="branches.html" aria-label="read more about branches on git">Git branching</a>
5958
</article>
6059

6160
</main>
6261
</div>
6362

64-
<footer class="site-footer">
65-
63+
<footer class="site-footer index-footer">
6664
<div class="container">
67-
6865
<p>&copy; 2026 The Blog. All rights reserved.</p>
69-
7066
</div>
71-
7267
</footer>
7368
</body>
7469
</html>

0 commit comments

Comments
 (0)