Update the vendor branch merge section to include the missing commands
and hopefully to make it more clear. Switch to using bogus branch names
that will stand out on purpose.

This rework 'play' tested on the lua branch merge, which needed dozens
of rebasing...

Sponsored by: Netflix