On the rebasing level, no matter which order you rebase them in, the automatic merging leaves the Baguette changes out...

Crashes as soon as one drops the git commit card onto the board above.