Lesson 3: Intermediate Git

Overview

Questions

• FIXME

Objectives

• FIXME

Intro to feature branch workflow

---

Intro to merging strategies

---

• Options for merging (fast forward, merge commit, rebase and merge)
• Other useful git features (cherry picking via git cherry-pick, stashing changes via git stash, resetting local state via git reset)