Skip to content

Commit 8a35fc2

Browse files
committed
HTML:
- Updated Git Branches explanation. - Updated README explanation.
1 parent 68f3876 commit 8a35fc2

2 files changed

Lines changed: 19 additions & 24 deletions

File tree

Wireframe/index.html

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ <h2>README</h2>
4040

4141
<p>
4242
The purpose of a README file is to provide important information for a project or piece of software.
43-
This may include things such as:
43+
It can include information such as:
4444
</p>
4545

4646
<ul>
47-
<li>instructions</li>
47+
<li>Installation/operating instructions</li>
4848

4949
<li>Version info</li>
5050

@@ -73,30 +73,24 @@ <h2>README</h2>
7373

7474
<h2>Git Branches</h2>
7575

76-
<ul>
77-
<li>In Git, repositories take the form of "branches."</li>
76+
<p>
77+
In Git, repositories are made up of "branches."
78+
</p>
7879

79-
<li>The default branch is called "main" - this represents the original code, developmental history and
80-
final version of a project.</li>
81-
82-
<li>Branches create a copy off of "main" to work on specific issues or parts of a project in isolation.</li>
80+
<ul>
81+
<li>The the base branch is called "main" - it represents the original code and main development
82+
history of a project.</li>
8383

84-
<li>Individual edits made and saved to a repository are called "commits."</li>
84+
<li>When you create a branch from here, you make a copy that can be worked on without messing up
85+
the original code.</li>
8586

86-
<li>Essentially, a "branch" is a specific sequence of "commits" representing a specific version of a project.</li>
87+
<li>Individual edits made and saved to a repository are called "commits," each with their own unique url.</li>
8788

88-
<li>Once finalised, a branch can be merged with the "main" via a "Pull Request"</li>
89-
</ul>
90-
91-
<p>
92-
Branches themselves can also be branched. This allows edits and issues to be specified even further.
93-
</p>
89+
<li>In summary, a "branch" is just a specific sequence of commits -
90+
a timeline of changes made to a project in isolation from the main development.</li>
9491

95-
<p>
96-
As an example: A user is working on their own branch of a project and identifies issues with two specific ares of code,
97-
but the rest of the project is otherwise fine. Individual branches could be created to focus on addressing these
98-
problems separately, without worry of accidentally making any drastic changes to the overall project.
99-
</p>
92+
<li>Once finalised and, after review, a branch can merged with main development via a "Pull Request."</li>
93+
</ul>
10094

10195
<a href="https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches">
10296
READ MORE

Wireframe/style.css

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,12 @@ main {
6464
margin: 0 auto calc(var(--space) * 4) auto;
6565
}
6666

67-
header {text-align: center;
67+
header {
68+
text-align: center;
6869
}
6970

70-
footer {text-align: center;
71+
footer {
72+
text-align: center;
7173
font-weight: 700;
7274
border-top-style: solid;
7375
}
@@ -95,7 +97,6 @@ article {
9597
border: var(--line);
9698
padding-bottom: var(--space);
9799
text-align: justify;
98-
align-items:center;
99100
display: grid;
100101
grid-template-columns: var(--space) 1fr var(--space);
101102
> * {

0 commit comments

Comments
 (0)