Workshop exercises and outstanding student questions for JSConf Asia 2013. PDF of slides TODO: Find out why the PDF didn't render! Forking Branching Committing The git log Pull requests Fetching and merging (and pull) Deleting a branch Handling a merge conflict Stashing Resetting and the Reflog