search

dask / dask-tutorial

Dask tutorial
https://tutorial.dask.org
BSD 3-Clause "New" or "Revised" License
1.83k stars 702 forks source link

Move default branch from "master" -> "main" #204

Closed jsignell closed 3 years ago

jsignell commented 3 years ago

@jrbourbeau and I are in the process of moving the default branch for this repo from master to main.

What you'll see

Once the name on github is changed (the first box above is Xed, or this issue closed), when you try to git pull you'll get 

Your configuration specifies to merge with the ref 'refs/heads/master'
from the remote, but no such ref was fetched.

What you need to do

First: head to your fork and rename the default branch there Then:

git branch -m master main
git fetch origin
git branch -u origin/main main
martindurant commented 3 years ago

Does the branch rename itself create a notification?

jsignell commented 3 years ago

Does the branch rename itself create a notification?

No, but I am making these issues on every repo.

EDIT: Well actually in the github UI it makes a notification. Take a look at https://github.com/dask/dask-examples to see what that looks like

martindurant commented 3 years ago

Right, but git fetch origin should happen after the branch is actually renamed - I suppose when this issue is closed.

jsignell commented 3 years ago

Yeah if you have suggestions on how to word these issues better, please let me know :)

martindurant commented 3 years ago

What you need to do

to

What you need to do

Once the name on github is changed (the first box above is Xed, or this issue closed)

Maybe also note that push/pulling from the previous default branch will still work due to github redirects? This should cause a message in the terminal, but I haven't tried it. Whatever the message is, that's what people might search on in the future.

martindurant commented 3 years ago

Thanks for handling this! One of those no-fun tasks...

jsignell commented 3 years ago

better?

martindurant commented 3 years ago

Yes, perfect. I thought about it a moment, and yes it makes sense that people would first see a problem on pull, because presumably if you were to push to your fork/master, that would still be fine, and any PR would pick the default upstream branch without trouble - not that you normally PR from your default branch anyway.