Yuuki-Discord / Yuuki-Bot

Free and open-source general-purpose bot for Discord.
MIT License
37 stars 7 forks source link

Rename default branch to main #76

Closed Erisa closed 3 years ago

Erisa commented 3 years ago

tldr if you just got here, run this on your local copy:

git pull origin main
git checkout main
git branch -D master

and all will be right in the world.

-- Now that GitHub has an easy way to do it: https://github.blog/changelog/2021-01-19-support-for-renaming-an-existing-branch/ I propose updating the default branch to be called main.

Aside from me having to update the actions workflows, this will require everyone with a local copy of the code to run some commands, which will be shown on the main page of the repository for every contributor: Screenshot_20210120-202631_Vivaldi

It's not a change to be made lightly on an active repository, maybe we can take advantage of this to also update the inconsistencies in author details of past commits? Suggestions welcomed.

spotlightishere commented 3 years ago

I am completely for both proposed actions! main is a good branch name and one I've taken to use myself where possible.

Similarly, the opportunity to rewrite author details would be much appreciated given earlier commits. I believe we discussed this at a point but never followed through due to the hassle of having everyone resync. Now that this action is simplified to pulling a separate branch with its own history anyway, there's no reason not to, in my opinion.

Erisa commented 3 years ago

Both changes should be ready to go now, changing default shortly after sending this.

Since we opted to not use githubs rename system, updating local copies should be a matter of

git pull origin main
git checkout main
git branch -D master

Keeping open for a little bit so people see.