Branch policy change (main and develop)

[flit]

The branch configuration policy of pyOCD has changed. Henceforth we will use a combination of these two branches:

• main: the default branch, intended to remain stable and match the most recent release.
• develop: used for active development of the next release.

Renaming master

As part of this change, the master branch is being renamed to main. This will mostly be transparent except for those users that have a fork and/or local working copy of the git repo, in which case you'll have to manually update your branch name.

These git commands will rename your local working copy's master branch to main, and will set the upstream branch of main to origin/main. This assumes the origin remote is the main pyOCD repo.

git branch -m master main
git fetch origin
git branch -u origin/main main

If you have a fork, you will have to rename master in the GitHub settings. (Because the default branch protection rules disallow deleting the default branch.)