Details
-
Type:
RFC
-
Status: Implemented
-
Resolution: Done
-
Component/s: DM
-
Labels:None
Description
A number of developers have asked that we follow the new git and Github conventions and switch our default branch from master to main.
Background:
https://sfconservancy.org/news/2020/jun/23/gitbranchname/
Github has already switched:
https://github.com/github/renaming
and we now have new repos created with the new default name, thus now introducing a level of inconsistency that will only get worse.
RFC to:
- Change the dev guide https://developer.lsst.io/work/flow.html#the-master-branch
- Propose we ask TCAMs to organize a day (it's the kind of thing we used to do at team all-hands) to switch existing repos and other documentation references.
(Indigenous People day is Oct 12, just saying and many (most?) of us don't have employers who observe it so there's an idea)
Attachments
Issue Links
- is triggering
-
DM-32648 Change default branch name to "main"
- Done
- relates to
-
DM-32710 Update documentation infrastructure for main default branch migration
- Done
- mentioned in
-
Page Loading...
-
Page Loading...
-
Page Loading...
-
Page Loading...
-
Page Loading...
-
Page Loading...
-
Page Loading...
Unfortunately, git symbolic-ref main refs/heads/main may allow master to stay pointing to where main does, but my experiments seem to show that it is not the equivalent of a real branch, and commands do not work identically: e.g. git checkout master gives "detached HEAD" state, and I suspect merges will also be problematic. Also, I believe that the symbolic ref is only local to a clone; it does not seem possible to make it mandatory for all new clones.
If you are concerned about muscle memory typing the wrong branch name, you might try to use git checkout - or git switch - instead. It's shorter, and quite often what you want.