[Discussion] Using "master" as branch name #10226
Replies: 12 comments 8 replies
-
This will be a huge headache and will break a lot of links. This was discussed in the past and the enormity of it was daunting along with the repercussions (downstream packagers, old bugs, documentation, online links, etc..etc..). I understand the sentiment but yikes... |
Beta Was this translation helpful? Give feedback.
-
I believe from a technical standpoint only admins can make the change, so it is really that team that must make the decision. That is @wwmayer , @yorikvanhavre , @sliptonic , and @kkremitzki . I support the change, but can’t actually make it. |
Beta Was this translation helpful? Give feedback.
-
i agree with the change too |
Beta Was this translation helpful? Give feedback.
-
as long as there is chess masters and university master classes, I think there's nothing wrong with a master branch |
Beta Was this translation helpful? Give feedback.
-
In any case, it seems like there is a large consensus to do it, so let's do it. @FreeCAD/maintainers , if you see any issue with this, please speak now ;) |
Beta Was this translation helpful? Give feedback.
-
I'd be really careful with that kind of change, it can cause severe issues. This change is technically unnecessary and can cause many hours of work. One of your suppliers made that change and their service was entirely unavailable for a while. |
Beta Was this translation helpful? Give feedback.
-
@yorikvanhavre, would it be possible to just create a mirror branch, instead of renaming? In this case, all existing scripts work and you always can claim you are 100% woke. |
Beta Was this translation helpful? Give feedback.
-
I am 100% woke already 😆 I think leaving a master branch in place is dangerous because people will still rely on it although it won't be updated anymore. Better remove it so an error occurs on people's git clients and they are forced to update. I think before doing this we need to:
git branch -m master main
git fetch origin
git branch -u origin/main main
git remote set-head origin -a
Let's program it for the weekend of october 7/8th? BTW I'm just testing the above workflow on a dummytest repo, when the master branch is gone on github, when trying to pull from your local client, you get:
So it's not very breaking, which is good or bad, nothing will break on user's side, they just won't be able to update until they rename, but some people might not see the message. Anyway, I think this is the way to go. Where should we publish this? Forum + github maintainers certainly, but is it worth a blog post too? |
Beta Was this translation helpful? Give feedback.
-
Ok programmed for sunday 8th, at 20h00 UTC https://forum.freecad.org/viewtopic.php?p=710744#p710744 |
Beta Was this translation helpful? Give feedback.
-
ok it's done! @FreeCAD/maintainers please update your local branch!
|
Beta Was this translation helpful? Give feedback.
-
Closing. |
Beta Was this translation helpful? Give feedback.
-
Is there an existing issue for this?
Full version info
Subproject(s) affected?
None
Problem description
Many communities are moving away from terms such as "master". This is also true in Git, for example discussed by the Software Freedom Conservancy and GitHub. I think it would be good if the FreeCAD project makes the same change by renaming
master
tomain
, which appears to be the most popular replacement.It's probably best to set a date, announce it widely and provide some instructions for those who have clones on their local machines and in their GitHub account.
Anything else?
No response
Code of Conduct
Beta Was this translation helpful? Give feedback.
All reactions