@@ -137,7 +137,27 @@ will learn in the next episode.
137
137
138
138
---
139
139
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._
141
161
142
162
Github gives us many insights into our repository. Nothing here is
143
163
really specific to Github (everything can be done with regular Git),
@@ -153,10 +173,10 @@ check:
153
173
154
174
---
155
175
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._
157
178
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:
160
180
161
181
- Visit [ https://choosealicense.com/ ] ( https://choosealicense.com/ ) and let it guide you.
162
182
- If you don't find a suitable license,
@@ -168,26 +188,6 @@ to an existing repository.
168
188
169
189
---
170
190
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
-
191
191
> ## Summary
192
192
>
193
193
> In this episode, we saw how we could do basic file management from the
0 commit comments