Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change master branch to main branch #356

Open
vinferrer opened this issue Nov 23, 2020 · 10 comments
Open

Change master branch to main branch #356

vinferrer opened this issue Nov 23, 2020 · 10 comments
Labels
Discussion Discussion of a concept or implementation. Need to stay always open.

Comments

@vinferrer
Copy link
Collaborator

I'm opening this discussion because I think that there are several reasons to do this change:

  1. Avoid racists and discriminative language implied in the master/slave words.
  2. Since main is becoming a default in new repos, we should adopt it.

Outstanding questions

- I found a tutorial on how to do it, thought i don't have privileges. Who wanna take care of it: 
- https://stevenmortimer.com/5-steps-to-change-github-default-branch-from-master-to-main/
@vinferrer vinferrer added the Discussion Discussion of a concept or implementation. Need to stay always open. label Nov 23, 2020
@eurunuela
Copy link
Collaborator

Well, I'd say it's more about when we want to make the change.

As you say, it's a simple change to make but every phys2bids developer should be noticed first.

I think the best we can do is set a date and announce in a couple of weeks time to make sure we all know about the transition.

@vinferrer
Copy link
Collaborator Author

Sure, that's why i oppened an issue

@tsalo
Copy link
Member

tsalo commented Nov 23, 2020

This came up in tedana as well (see ME-ICA/tedana#619). Based on this post, I think that GitHub will roll out changes before year's end to make the transfer easier. I would wait until GitHub announces those changes.

@vinferrer
Copy link
Collaborator Author

oh, fair enough

@RayStick
Copy link
Member

Yes I am in full support of changing this but happy to wait a short while if that is sensible for logistics.

@smoia
Copy link
Member

smoia commented Dec 2, 2020

Hi all,
I fully support the change only if we use the name maegister or magister (how cool is to bring back some Latin here and there).
Jokes aside, I'm sorry to be the voice out of the choir, but my support of changing names comes with some conditions.
I definitely won't be against this process (after all, it's not a bad process), but I would like to invite you to think about what we're doing and why we're doing it.

On one side, we have contributors that might need some help in getting this change done (if they want to) or in any case might have to adjust their configuration to keep working with upstream. On the other, we have some configurations of our own to adapt to the change.
In addition to that, I have the bad feeling that this is more of an image stunt rather than a real, felt, change for the better. So, since I'd like to put action where our mouth is, I would propose to actually find a way to actively support reduction of any form of slavery (or simil-slavery) and partake somehow as physiopy.

For that, I would propose that we nominate a person or a team responsible for taking care of this issue. On one side, this person(s) might help and ease the transition (if we see that GitHub didn't ease the process enough), similarly to what @jbteves is volunteering to do in ME-ICA/tedana#619. This means taking care of helping people in changing configurations and adapting our workflows to work with main. On the other side, this person(s) could look into and find a good and doable action that we can implement as a community. It could be a statement, a tweet/github challenge, a donation for a charity, or a possibly better idea.

We can discuss this issue further next week during our meeting (agenda coming in the upcoming two days).
What do you all think?

@RayStick
Copy link
Member

RayStick commented Dec 2, 2020

Thanks for your thoughts Stefano. I will have a think about them, and bring thoughts to the next meeting, which might be an easier/better forum to discuss.

@tsalo
Copy link
Member

tsalo commented Jan 29, 2021

I can't speak to the larger proposed changes, but it looks like the steps for renaming the master branch have recently been improved (see this post), so it should be much easier to do now.

EDIT: We've successfully done it for tedana, with no issues so far.

@RayStick
Copy link
Member

RayStick commented May 6, 2021

As per this post (updated since Taylor shared it I think) it seems you can now simply rename the branch from master to main. I did that for one of my own repos on GitHub, and this popped up:

Screen Shot 2021-05-06 at 5 13 03 PM

I followed those instructions and all seemed to work fine. Though this was on a repo I don't really use.
It says that these things will happen if we rename from master to main:

  • Re-target any open pull requests
  • Update any draft releases based on the branch
  • Move any branch protection rules that explicitly reference the old name
  • Update the branch used to build GitHub Pages, if applicable
  • Show a notice to repository contributors, maintainers, and admins on the repository homepage with instructions to update local copies of the repository
  • Show a notice to contributors who git push to the old branch
  • Redirect web requests for the old branch name to the new branch name
  • Return a "Moved Permanently" response in API requests for the old branch name

Do any of those things look like they'd pose a problem?

@eurunuela
Copy link
Collaborator

We will have to make sure that the CI and docs point to main rather than master. Other than that, I can't think of any other issue we could face when changing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Discussion Discussion of a concept or implementation. Need to stay always open.
Projects
None yet
Development

No branches or pull requests

5 participants