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

⚠️ Update the default branch of the Apollo Server repository. #4302

Merged
merged 9 commits into from
Jun 24, 2020
Merged

Conversation

abernix
Copy link
Member

@abernix abernix commented Jun 24, 2020

This PR changes the default branch of this repository to main from its previous name, master. While this could be done exclusively in the UI (and that change has been made already), this is being opened as a PR for a few reasons:

  • Awareness: Anyone who is routinely developing on this repository should take note of the new branch name, and hopefully this PR makes it clear that it happens (e.g., via repository watcher notifications).
  • Review: There were a lot of changes to files within this repository (mostly search and replaced, largely related to links in documentation) that relate to this change which are worth reviewing!
  • PR re-targeting: All of the existing PRs need to be changed to use the new branch name.
    With the recent introduction of automatic pull-request retargeting by GitHub, this will happen automatically when this PR is merged.

I've pushed the housekeeping commits to make this change whole to the (no longer default!) master branch which this PR is opened from. There are a couple additional changes which I've put into this PR, mainly around alignment of patterns within this repository and adopting the directory notation within package.json's repository specifications. See the individual commits for details.

This PR will result in a release being created for this repository.
@abernix abernix merged commit a2d2792 into main Jun 24, 2020
@abernix abernix deleted the master branch June 24, 2020 18:18
@abernix
Copy link
Member Author

abernix commented Jun 24, 2020

Well, that did not work as expected. When this PR merged, many PRs were re-targeted, but most were closed. I've contacted GitHub Support and am going to open a pinned issue.

EDIT: Fixed! See #4304 for details.

@gentunian
Copy link

did I miss any april's fools?

@Vultraz
Copy link

Vultraz commented Jul 1, 2020

I'm curious, what was this change for?

@gentunian
Copy link

don't say it out loud, but probably has to do with this rare movement that thinks the word "master" refers to slavery.

@favna
Copy link
Contributor

favna commented Jul 5, 2020

@gentunian you hit the mark. Git and GitHub are reportedly also moving towards releasing an update where this will become standard after said update. It's a dark colourful white rainbow world we live in.

@gentunian
Copy link

Thanks, for sure changing branches naming will make this world a better place. Glad to see this coming.

abernix added a commit to apollographql/federation that referenced this pull request Sep 4, 2020
This PR will result in a release being created for this repository.

Apollo-Orig-Commit-AS: apollographql/apollo-server@aa22b2c
abernix added a commit to apollographql/federation that referenced this pull request Sep 4, 2020
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 21, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants