Skip to content

Commit 8f5b79c

Browse files
author
Jordan McCullough
committed
Merge pull request #251 from github/lab-tuneup
Lab tuneup
2 parents 4dd095a + ef61df3 commit 8f5b79c

File tree

1 file changed

+20
-14
lines changed

1 file changed

+20
-14
lines changed

foundations/index.md

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,16 @@ Just as with the Git technology operating on GitHub, local repositories also use
272272
{% capture slide %}![What is a branch](../assets/diagrams/what-is-a-branch.svg){% endcapture %}{% include slide-section %}
273273

274274
{% capture lab %}
275-
1. Create a branch and make commits to it
276-
2. Notice the notification bar on the repository home page
277-
3. Open a *Compare and Pull Request*
278-
4. Facilitate team or colleague code review
275+
1. Using the GitHub web UI, create a branch with an articulate feature name
276+
2. Make two distinct commits to the branch, each contributing part of the feature's changes
277+
3. Return to the homepage of the repository by clicking the repository's name
278+
4. Notice the suggestion message asking if you'd like to "compare and pull request"
279+
5. Click on *Compare and Pull Request*
280+
6. Describe the reasoning behind the changes on this branch via the pull request
281+
7. @mention a team or colleague, asking for a code review
282+
8. Address the points raised by the reviewers through an additional commit to the branch
283+
9. Ask for a final review and :+1: from a colleague
284+
10. Merge the pull request
279285
{% endcapture %}{% include lab %}
280286

281287
### Details
@@ -289,7 +295,7 @@ A branch is a divergent path in the history of the code base. It may contain an
289295

290296

291297
{% capture slide %}
292-
### Contributing with Pull Requests
298+
### Contributing with Forks & Pull Requests
293299
{% endcapture %}{% include slide-section %}
294300

295301
{% capture slide %}
@@ -298,8 +304,10 @@ A branch is a divergent path in the history of the code base. It may contain an
298304

299305
{% capture lab %}
300306
1. Create a Fork of a repository needing contributions
301-
2. Follow the contribution pattern of the GitHub Flow
302-
3. Submit a Pull Request and iterate with progressive commits
307+
2. Follow the contribution pattern of the [GitHub Flow](https://guides.github.com/introduction/flow/), with the branch creation and commits happening on your fork of the repository
308+
3. Observe the Network and Members graph that offer visualizations of your commits and fork
309+
4. Merge the pull request
310+
5. Observe your contributions in the original repository, having preserved your username as the author of the code
303311
{% endcapture %}{% include lab %}
304312

305313
#### Resources
@@ -316,13 +324,11 @@ A branch is a divergent path in the history of the code base. It may contain an
316324
{% endcapture %}{% include slide-section %}
317325

318326
{% capture lab %}
319-
1. Make commits on GitHub repository
320-
2. Clone in Desktop (if repository does not yet exist locally)
321-
3. Review the changes locally
322-
4. Make commits on local repository
323-
5. Understand local history versus remote/GitHub
324-
6. Publish (`push`) the changes
325-
7. Review the changes on GitHub
327+
1. Clone an existing GitHub repo using the GitHub for Desktop application
328+
2. Following the GitHub Flow pattern, create a topic branch and make commits to the local repository
329+
3. Review the local (unsynced) commits in history
330+
4. Publish the changes via the Sync button
331+
5. Verify the presence of the now-synced changes by refreshing the GitHub web UI of the cloned repo
326332
{% endcapture %}{% include lab %}
327333

328334
### Details

0 commit comments

Comments
 (0)