day2_3.md

Day 2, Session 3

Who: Jenny

Agenda

• More advanced Git workflows
• How to go back in time, in various ways
• Commits/SHAs, branches, remotes, checkout, reset, merge (conflict), amend
• Repo we will work with:
  • https://github.com/rstats-wtf/wtf-ascii-funtimes

Slides

• git-and-github-daily-workflows.pdf

Activity prompts

• integrated into slides (see above) and Happy Git (see below)

Resources

All link to Happy Git

• Branches
• Remotes
• Fork and clone
• Get upstream changes for a fork
• The whole Daily Workflows part
• Existing project, GitHub last