Land frontend-base

[arbrandes]

Description

When the time comes to land all the apps' frontend-base branches into master, do not attempt a regular merge. These branches are too far gone for it. Besides, they've already been receiving ports of the features and bugfixes from master since their inception, so there's no need to attempt reconciliation.

Do this instead:

git checkout frontend-base
git merge -s ours master        # merges master in, but keeps frontend-base content
git checkout master
git merge frontend-base        # this is now a fast-forward 

This produces a real merge commit showing both histories joined, with frontend-base content as the result, and master's history intact up to that point.