Please note: I've moved all questions to the student-questions/ directory. Workshop exercises and outstanding student questions for JSConf Asia 2014. PDF of slides 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