Rebase vs merge chooser

Pick rebase or merge for chip-team scenarios — see the resulting history shape and why one choice fits (no interactive rebase).