Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename branch master -> main #886

Merged
merged 1 commit into from
Jun 1, 2023
Merged

rename branch master -> main #886

merged 1 commit into from
Jun 1, 2023

Conversation

altergui
Copy link
Contributor

subtask of vocdoni/interoperability#27

this is a PR replacing a few ocurrences in code,
the main task would be changing the default branch in github project, in a coordinated way

@p4u
Copy link
Member

p4u commented Apr 13, 2023

This changes looks a bit scary, but its true that now its probably a good moment for doing it...
I've like to add some kind of backwards compatibility, we might for some time, push docker images on both tags master and main

@altergui altergui self-assigned this May 30, 2023
@altergui
Copy link
Contributor Author

i created main branch (pointing to same commit as master), so that the actions for this PR work

i believe the following steps would be:

  • merge this PR
  • immediately after, change vocdoni-node github repo default branch to be main
  • immediately after, delete master branch

i believe github rebases all open PRs when you change the default branch, but i'm going to test in a private repo to see how this works. if not, i'd manually edit each PR to target main branch, it's 5 minutes work.

@altergui
Copy link
Contributor Author

yep, i just tested and confirmed definitely github updates all open PRs to point to the new default automatically

lastly, after all the moves in github are done, each dev will need to do this on their local repos:

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

@altergui altergui force-pushed the fix/rename_master_to_main branch 2 times, most recently from 454d9a1 to d874c00 Compare May 31, 2023 18:16
Copy link
Member

@p4u p4u left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's abolish the slavery

@p4u p4u merged commit e620250 into master Jun 1, 2023
@p4u p4u deleted the fix/rename_master_to_main branch June 1, 2023 10:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants