Landing frontend-base

[arbrandes]

Description

When the time comes to land all the app's frontend-base branches into master, do this:

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.

TODO

• https://github.com/openedx/frontend-app-authn/tree/frontend-base
• https://github.com/openedx/frontend-app-learner-dashboard/tree/frontend-base