Skip to content

Commit f50e46e

Browse files
committed
rearranging the steps
1 parent 1288734 commit f50e46e

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

creating-using-web.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,27 @@ will learn in the next episode.
137137

138138
---
139139

140-
## Step 5: Repository insights and settings
140+
## Step 5: How can we merge branches?
141+
_This is an optional step which the instructor may demonstrate and discuss._
142+
143+
We made a separate branch, separate from the main branch `master`.
144+
What happens when we decide we like that change, and want to take it
145+
into use? We will soon see the magic of Git.
146+
147+
First browse to the overview of all branches:
148+
<img src="{{ site.baseurl }}/img/creating-using-web/branches-click.png" width="400px" style="border:2px solid #000000;">
149+
150+
Now to initiate a merge (request), click on "New pull request":
151+
<img src="{{ site.baseurl }}/img/creating-using-web/branches-overview.png" width="800px" style="border:2px solid #000000;">
152+
153+
Once a "pull request" (think of it as a change proposal) is open, it can be
154+
reviewed and merged. We will return to "pull requests" when we later discuss
155+
how to contribute changes.
156+
157+
---
158+
159+
## Step 6: Repository insights and settings
160+
_This is an optional step which the instructor may demonstrate and discuss._
141161

142162
Github gives us many insights into our repository. Nothing here is
143163
really specific to Github (everything can be done with regular Git),
@@ -153,10 +173,10 @@ check:
153173

154174
---
155175

156-
## Step 6: Adding a license to an existing repository
176+
## Step 7: Adding a license to an existing repository
177+
_This is an optional step which the instructor may demonstrate and discuss._
157178

158-
This is an optional step to show how we can add a license
159-
to an existing repository.
179+
How to add a license to an existing repository:
160180

161181
- Visit [https://choosealicense.com/](https://choosealicense.com/) and let it guide you.
162182
- If you don't find a suitable license,
@@ -168,26 +188,6 @@ to an existing repository.
168188

169189
---
170190

171-
## Optional step: How can we merge branches?
172-
173-
This is an optional step which the instructor may demonstrate and discuss:
174-
175-
We made a separate branch, separate from the main branch `master`.
176-
What happens when we decide we like that change, and want to take it
177-
into use? We will soon see the magic of Git.
178-
179-
First browse to the overview of all branches:
180-
<img src="{{ site.baseurl }}/img/creating-using-web/branches-click.png" width="400px" style="border:2px solid #000000;">
181-
182-
Now to initiate a merge (request), click on "New pull request":
183-
<img src="{{ site.baseurl }}/img/creating-using-web/branches-overview.png" width="800px" style="border:2px solid #000000;">
184-
185-
Once a "pull request" (think of it as a change proposal) is open, it can be
186-
reviewed and merged. We will return to "pull requests" when we later discuss
187-
how to contribute changes.
188-
189-
---
190-
191191
> ## Summary
192192
>
193193
> In this episode, we saw how we could do basic file management from the

0 commit comments

Comments
 (0)