gitlab-training icon indicating copy to clipboard operation
gitlab-training copied to clipboard

Rename master to main

Open theFeu opened this issue 4 years ago • 3 comments
trafficstars

Fixes #129

theFeu avatar Apr 14 '21 12:04 theFeu

@htriem Do you think it would make sense to add a slide or a note that acknowledges the change?

theFeu avatar Apr 14 '21 12:04 theFeu

This change will only take effect in the self hosted instances from 22 June 2021 onwards, so there's a due date in this one now :)

theFeu avatar Apr 16 '21 12:04 theFeu

Recommend linking https://about.gitlab.com/blog/2021/03/10/new-git-default-branch-name/ as SSoT. Change affects both, self-hosted, and newly created projects on GitLab.com.

dnsmichi avatar Apr 19 '21 20:04 dnsmichi

So far, I see the issue with the git version we use on our machines. The current git version on the CentOS we are using still goes with master as a default (and we create the first branch locally on our machines).

What we could do is, that we include git config --global init.defaultBranch main into our provisioning?

theFeu avatar Sep 21 '22 10:09 theFeu

I think adding the global defaultBranch is a good idea. Plus, we should maybe mention that historically it was master and many vendors are in the progress of moving to main

martialblog avatar Sep 21 '22 11:09 martialblog

I just rebased the branch

martialblog avatar Sep 26 '22 09:09 martialblog

@martialblog - Been a bit out of the loop on this one, did we change the provisioning yet? Else I'll give it a shot now :)

theFeu avatar Sep 28 '22 08:09 theFeu

@theFeu I don't know what version the NWS GitLab instances currently have. Nonetheless we should add your suggestion git config --global init.defaultBranch main

martialblog avatar Sep 28 '22 09:09 martialblog

The GitLab instances already are at a version that prefers main, it's only our terminal machines that don't have it yet. And since we push the local master to the remote, we also have a master in the GitLab - should be fixed in the provisioning. I'll look into it!

theFeu avatar Sep 28 '22 11:09 theFeu

Done!

theFeu avatar Sep 28 '22 12:09 theFeu

:dancers:

martialblog avatar Sep 28 '22 13:09 martialblog