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

Rename the master branch to main #239

Merged
merged 1 commit into from Dec 18, 2020
Merged

Conversation

quba42
Copy link
Collaborator

@quba42 quba42 commented Dec 10, 2020

[noissue]

With this change, I will need to push a new branch main, change the repositories default branch to it, add the branch protection rule, and finally delete the master branch.

  • Add main branch to the repo.
  • Add branch protection for the main branch.
  • Merge this PR to the new main branch.
  • Make the main branch the default branch.
  • Unprotect and delete the master branch.

@quba42
Copy link
Collaborator Author

quba42 commented Dec 10, 2020

There are currently still five hits for git grep master. Three of them refer to the pulpcore master, one refers to the pulp-fixtures master, and one is part of a sphinx variable. These will need to remain for now.

@quba42 quba42 marked this pull request as ready for review December 10, 2020 20:29
@pulpbot
Copy link
Member

pulpbot commented Dec 10, 2020

WARNING!!! This PR is not attached to an issue. In most cases this is not advisable. Please see our PR docs for more information about how to attach this PR to an issue.

@mdellweg
Copy link
Member

Have you considered calling it "develop" ?

@quba42
Copy link
Collaborator Author

quba42 commented Dec 14, 2020

Have you considered calling it "develop" ?

I guess my thinking was that in the past the presence of a "develop" branch has implied a specific workflow involving both a "develop" and a "master" branch. But if other projects are now using "develop" instead of "master", I am fine with going along with that for consistency. If I have noticed correctly the foreman-ansible-modules appear to have gone this route.

@ipanova
Copy link
Member

ipanova commented Dec 15, 2020

Have you considered calling it "develop" ?

I guess my thinking was that in the past the presence of a "develop" branch has implied a specific workflow involving both a "develop" and a "master" branch. But if other projects are now using "develop" instead of "master", I am fine with going along with that for consistency. If I have noticed correctly the foreman-ansible-modules appear to have gone this route.

I have looked in the internet a bit and usually people go whether with main or develop. I think this is matter of preference in the end of the day and you should call the shots 🍹

@quba42
Copy link
Collaborator Author

quba42 commented Dec 18, 2020

I have looked in the internet a bit and usually people go whether with main or develop. I think this is matter of preference in the end of the day and you should call the shots tropical_drink

I guess I prefer "main". Statements like: "When working with Git repositories everyone wants to merge their changes into the main branch" or "PRs are opened against the main branch" just make the most sense to me with "main". I also like consistency, so if I ever find the rest of the project has all moved to "devel", I may revise my personal policy. 😜

@quba42 quba42 changed the base branch from master to main December 18, 2020 18:23
@quba42 quba42 merged commit ff7bf43 into pulp:main Dec 18, 2020
@quba42 quba42 deleted the main_branch_prep branch December 18, 2020 18:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants