Week 1

Learn all about why we use branches, the types of branches, pushing, pulling and managing conflicts.

Learning goals

• How to write a good commit message and submit easy to understand PRs

• Understand why we use branches and the different types

• Practice using branches and handling changes between local and remote

• Understand what a merge conflict is and how to resolve them

• How to save temporary changes without committing them (ie. git stash)

• How to "remove" commits using reset (soft vs hard), revert, cherry-pick and rebase

• Be prepared to collaborate successfully using GitHub on your final project