Whenever you're ready, walk me through how you'd approach this.
Explain what git squash and git rebase are and when to use them.