roychoo / jsconf-asia-2014-git-and-github-workshop

Repo for outstanding questions from the Git/GitHub lab at JSConf Asia 2014 Singapore.

Workshop exercises and outstanding student questions for JSConf Asia 2014.

PDF of slides

1. Forking
2. Branching
3. Committing
4. The git log
5. Pull requests
6. Fetching and merging (and pull)
7. Deleting a branch
8. Handling a merge conflict
9. Stashing
10. Resetting and the Reflog