Move `master` branch to `main`
jennybc opened this issue · comments
Cc @schloerke
The master
branch of this repository will soon be renamed to main
, as part of a coordinated change across several GitHub organizations (including, but not limited to: tidyverse, r-lib, tidymodels, and sol-eng). We anticipate this will happen by the end of September 2021.
That will be preceded by a release of the usethis package, which will gain some functionality around detecting and adapting to a renamed default branch. There will also be a blog post at the time of this master
--> main
change.
The purpose of this issue is to:
- Help us firm up the list of targetted repositories
- Make sure all maintainers are aware of what's coming
- Give us an issue to close when the job is done
- Give us a place to put advice for collaborators re: how to adapt
message id: entire_lizard
GitHub's support for default branch renaming means that, in general, pull requests that target the default branch will be correctly re-targetted.
However, there are some edge cases, where this is not true. Some pull requests are automatically closed when the default branch is renamed and they cannot be re-opened. This happens when the PR-making branch, fork, or user no longer exists. (Literally, it appears to boil down to whether HEAD
of the PR branch is available for whatever behind-the-scenes magic is happening.)
There is 1 open pull request in this repo that is at risk of auto-closing:
A way to "rescue" the work on such a PR is described in isaacs/github#168 (comment). Here's the TL;DR:
If there is a PR displaying unknown repository after the fork was deleted, and you want to resurrect that PR, simply type:
git fetch origin refs/pull/123/head:foo
substituting (if necessary)
origin
for the remote pointing at the target repo, 123 for the PR number, andfoo
for the name of the local branch you want created to point to the head of the PR.Then you can simply
git checkout foo
... and resubmit a new one ....
message id: hardhearted_newt
I have moved the default branch from master
to main
here (and elsewhere)!
This blog post announces the larger effort and explains how contributors can update their local environments:
Here's the TL;DR:
- Update usethis (you want usethis v2.1.2 or higher):
install.packages("usethis")
- Anyone with an existing fork or clone can adjust to the renamed default branch with:
If you wish, you can read the documentation for
usethis::git_default_branch_rediscover()
git_default_branch_rediscover()
.
Or do the command line equivalent (see the blog post).
message id: goofy_chipmunk