From 52144b099cd6eaec54042376d2f348a32ed65549 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Fri, 20 Mar 2026 10:05:18 +0100 Subject: [PATCH 1/4] Blog: Switching from master to main --- _posts/2026-03-20-master-to-main.md | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 _posts/2026-03-20-master-to-main.md diff --git a/_posts/2026-03-20-master-to-main.md b/_posts/2026-03-20-master-to-main.md new file mode 100644 index 00000000..031504ce --- /dev/null +++ b/_posts/2026-03-20-master-to-main.md @@ -0,0 +1,32 @@ +--- +layout: post +title: Group Project: Switching from `master` to `main` +date: 2026-03-20 +github_username: rwaffen +--- + +Hi @everyone 👋, we have a large number of repositories, and we want to establish a clear and consistent standard for how we name our default branches across the organization. + +This is not only about using inclusive language, but also about improving clarity, reducing confusion, and aligning with current defaults such as main on GitHub. + +Since this change can involve a fair amount of work, we’d like to approach it collaboratively and involve everyone in the process. + +If you touch any repository and got some extra time to spend, please switch the default branch to `main` and update your local clones accordingly. + + +If you are a repository maintainer you can switch the default branch in the repository settings on GitHub. +See the GitHub documaentation to this: + +The commands to update your local clone are as follows: + +```shell +git branch -m master main +git fetch origin +git branch -u origin/main main +git remote set-head origin -a +``` + +Thx for your help! If you have any questions, feel free to ask. + +Cheers, +@rwaffen From 6af91e9d8893397e9dae0696295e5bc9ce54c252 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Fri, 20 Mar 2026 13:42:58 +0100 Subject: [PATCH 2/4] Update _posts/2026-03-20-master-to-main.md Co-authored-by: Yehuda Katz --- _posts/2026-03-20-master-to-main.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2026-03-20-master-to-main.md b/_posts/2026-03-20-master-to-main.md index 031504ce..d08400c1 100644 --- a/_posts/2026-03-20-master-to-main.md +++ b/_posts/2026-03-20-master-to-main.md @@ -7,7 +7,7 @@ github_username: rwaffen Hi @everyone 👋, we have a large number of repositories, and we want to establish a clear and consistent standard for how we name our default branches across the organization. -This is not only about using inclusive language, but also about improving clarity, reducing confusion, and aligning with current defaults such as main on GitHub. +The reason for this change is to align with current defaults on GitHub, upcoming changes to Git itself, as well as standardizing language, improving clarity, and reducing confusion of having different repositories with different defaults. Since this change can involve a fair amount of work, we’d like to approach it collaboratively and involve everyone in the process. From 9253f08ee82b5bfe3f468934576de82bbd483ed9 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Fri, 27 Mar 2026 10:36:39 +0100 Subject: [PATCH 3/4] Update _posts/2026-03-20-master-to-main.md Co-authored-by: Ewoud Kohl van Wijngaarden --- _posts/2026-03-20-master-to-main.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2026-03-20-master-to-main.md b/_posts/2026-03-20-master-to-main.md index d08400c1..c418bce0 100644 --- a/_posts/2026-03-20-master-to-main.md +++ b/_posts/2026-03-20-master-to-main.md @@ -15,7 +15,7 @@ If you touch any repository and got some extra time to spend, please switch the If you are a repository maintainer you can switch the default branch in the repository settings on GitHub. -See the GitHub documaentation to this: +See the [GitHub documentation](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/renaming-a-branch). The commands to update your local clone are as follows: From 71720b922759a8e93c0ff44d27c5a26dd276ea67 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Fri, 27 Mar 2026 10:42:28 +0100 Subject: [PATCH 4/4] Update migration instructions to include renaming the default branch to 'main' --- _docs/migrate_module.md | 1 + 1 file changed, 1 insertion(+) diff --git a/_docs/migrate_module.md b/_docs/migrate_module.md index ac0a6d52..d0552647 100644 --- a/_docs/migrate_module.md +++ b/_docs/migrate_module.md @@ -14,6 +14,7 @@ You will have someone by your side in this process. The general flow is to… * If this module was created with PDK delete .sync.yaml. * Ensure that the module has a correct `LICENSE` file in the docroot that matches the mentioned license in the `metadata.json`. * If the repo is a fork, to ensure pull requests go to the correct repo, [detach it from the fork network](https://docs.github.com/pull-requests/collaborating-with-pull-requests/working-with-forks/detaching-a-fork). + * Rename the default branch to `main` if it is not already named `main`. * At this point you can [transfer your own repository](https://docs.github.com/repositories/creating-and-managing-repositories/transferring-a-repository). * Ask an admin to * Verify that all webhooks are disabled.