Advanced Git Practice

A workshop for practicing/learning git, specifically tackling:

• branching/merging
• merge conflicts
• stashing
• cherry picking
• rebasing

Resources:

• Git Internals (pdf book)
  • related video/presentation

Workshop Guide:

# first clone this repository, enter its folder
git clone git@github.com:dangbert/git-workshop.git
cd git-workshop