@@ -143,19 +143,22 @@ $ git remote add upstream https://github.com/SeattleTestbed/repy_v2.git
143
143
Fetching and merging the latest changes of ` upstream ` (remembering that the
144
144
` upstream ` alias points to the original repository) can be done with Git's
145
145
` pull ` command. The ` pull ` command fetches changes made to the remote
146
- repository and merges them into your local repository. Branches are multiple
147
- working versions of a master project (or document). The main branch is the
148
- master repository and multiple, local branches of this master may be created by
149
- users so that they can work on the project before committing their work to the
150
- master document. The pull command expects to see a (by default, the master)
151
- branch name, which the user will find on the project's [ main
152
- repository] ( https://github.com/SeattleTestbed/repy_v2 ) . Information on
153
- creating a new branch is in the next section, ` Add a New Branch Locally ` .
146
+ repository and merges them into your local repository.
147
+
148
+ ### Branches
149
+ Branches are multiple working versions of a master project (or document). The
150
+ main branch is the master repository and multiple, local branches of this
151
+ master may be created by users so that they can work on the project before
152
+ committing their work to the master document. The pull command expects to see
153
+ a (by default, the master) branch name, which the user will find on the
154
+ project's [ main repository] ( https://github.com/SeattleTestbed/repy_v2 ) .
155
+ Information on creating a new branch is in the next section, `Add a New Branch
156
+ Locally`.
154
157
155
158
![ GitHub Branches] ( /images/branches_sm.png )
156
159
157
- Additional information on [ syncing a
158
- fork ] ( https://help.github.com/articles/syncing-a-fork/ ) is recommended .
160
+ [ The GitHub help ] ( https://help.github.com/articles/ syncing-a-fork/ ) has more
161
+ information on keeping your forks in sync with upstream .
159
162
160
163
```
161
164
$ git pull upstream master
@@ -165,7 +168,7 @@ From https://github.com/SeattleTestbed/repy_v2
165
168
Already up-to-date.
166
169
```
167
170
168
- ### Add a New Branch Locally
171
+ #### Add a New Branch Locally
169
172
170
173
First, list all known local branches of the repository, by typing the following:
171
174
@@ -191,7 +194,7 @@ Switched to branch 'new_branch'
191
194
Note: ``` git checkout -b [branchname] ``` is a shortcut to create and checkout a
192
195
new branch.
193
196
194
- ### Commit a New File to the Branch
197
+ #### Commit a New File to the Branch
195
198
196
199
Create a ` LICENSE ` file and save it to the local machine. You do this by
197
200
opening a new document in a text editor and saving as ` LICENSE ` in the current
@@ -266,7 +269,7 @@ Date: Tue Sep 2 14:46:36 2014 -0400
266
269
```
267
270
268
271
269
- ### Push the Commit to the Remote (Forked) Repository
272
+ #### Push the Commit to the Remote (Forked) Repository
270
273
271
274
This step will push the branch to the remote repository controlled by the user
272
275
(the forked version that you created earlier). The changes committed in the
0 commit comments