Used bits like these before, but hadn't formalized them
Merge remote-tracking branch 'origin/master'