Day 1: testing-status, add, diff
day 2: --amend
2 commits
chapter 1 END
switch to testing Branch
Branch Master: make a change
resolve conflicts
hotfix