master branch has been replaced

[richvdh]

On 2021-08-27, we replaced the default master branch in the matrix-doc repo with a new branch, named main.

The old master branch is retained as old_master.

We have done this to clean up some history in the repository to ensure that git annotate works in the data directory. Previously it only went back as far as 2021-01, due to multiple copies of the data existing at that time.

We have also taken the opportunity to rename the branch, for consistency with many other projects under the matrix-org umbrella.

Actions that need to be taken by users of this repository:

• If you have local checkouts of the repository, you should tell them that master has been renamed, and that there is a new default branch:

  git branch -m master old_master
  git fetch
  git branch -u origin/old_master old_master
  git remote set-head origin -a

• New branches and pull requests should be based on main rather than master (this will be the default behaviour).
• If you have existing pull requests (including MSC proposals) targetting old_master, you DO NOT need to rebase the branch or change the target of the pull request. Once the pull request is ready, the matrix-doc administrators will merge it to old_master and then cherry-pick the change into main.

[richvdh]

(for historical record: f8b83b7, on the main branch, has identical contents to dca99ee, on the old master branch: https://github.com/matrix-org/matrix-doc/compare/f8b83b7..dca99ee2)

[turt2live]

For self docs: e895827 is now on main as d9dd37d

Uncommitted stuff: e895827...old_master

[richvdh]

Uncommitted stuff: e895827...old_master

I'm afraid I don't understand this, @turt2live. Uncommitted to where? These things should be on both main and old_master.

[turt2live]

The comment is already out of date. Things landed on the old Master yesterday and needed bringing over. Was hoping to record where I got to in that, but ultimately didn't help.

No action needed.