Add instructions for updating branches from before Scalafmt (#2352)

This only includes a merge-based flow which will presumably be
squash-and-merged for any merged PRs. It is possible to do this with
rebasing but it is tricky and hard to describe in a fool-proof way.