Skip to content

Commit

Permalink
Update readme.md
Browse files Browse the repository at this point in the history
  • Loading branch information
ZebGirouard authored Jan 5, 2017
1 parent ad03c09 commit 91ec93c
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Location: SF

![](https://ga-dash.s3.amazonaws.com/production/assets/logo-9f88ae6c9c3871690e33280fcf557f33.png)

<!--Actually 11:05 -->

<!--1:30 5 minutes -->

# GitHub Collaboration
Expand Down Expand Up @@ -64,6 +66,8 @@ into master.
interfering. When a feature is complete, it can be merged back into master.
3. To allow easy bug fixes on a stable version while features are being developed.

<!--Actually 11:12-->

<!--1:40 5 minutes -->

## `git fetch`, `git merge`, and `git pull`
Expand Down Expand Up @@ -91,6 +95,10 @@ There are two main scenarios for collaborating on coding projects:

**For this project, you should be collaborators!**

<!--Actually 11:28 when devs reading -->
<!--11:37 to get started on lab -->


<!--1:50 50 minutes -->

## Practice: Create and resolve a merge conflict
Expand All @@ -112,6 +120,8 @@ What happens if two people on a team change the same file? Merge conflicts (oft
10. Finally, go back to the GitHub repository and accept Partner2's pull request (there should not be any merge conflicts any more).
9. Feel free to delete this practice repository from your local machine and from GitHub. This workflow was intentionally sloppy and I'm hoping that you learned a little bit of what *not* to do.

<!--Actually 12:21 -->

<!--2:40 5 minutes -->

## Talking Points for Teams
Expand Down

0 comments on commit 91ec93c

Please sign in to comment.