Edward and Martin keep talking about branching and merging, including

how some of the other code integration commands work - including

rebase, cherry-pick, and revert. Part two of two.