Skip to content

clean up of the branches on the main repository #4062

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

Closed
5 of 6 tasks
keewis opened this issue May 14, 2020 · 3 comments
Closed
5 of 6 tasks

clean up of the branches on the main repository #4062

keewis opened this issue May 14, 2020 · 3 comments

Comments

@keewis
Copy link
Collaborator

keewis commented May 14, 2020

We have several branches on our main repository that appear to be either out-dated or used to build documentation on RTD (these are no longer necessary since RTD fixed the conda-out-of-memory issues for everyone: building on personal RTD setups should work). Since they already lead to confusion, I think we should try clean them up. Here's a list of the branches I think we can remove:

  • 0.11.x: seems to be for the 0.11 releases which are no longer maintained (points to the same commit as the v0.11.3 tag)
  • accessor-documentation: I intended to use this for building the documentation on RTD, but I accidentally opened built-in accessor documentation #3988 from it instead of from the branch on my own repository. It will be removed once that PR is merged / closed.
  • fix-docs is from more than a year ago. @shoyer, is there anything that was not already merged into master?
  • fix-rtd was a attempt to fix RTD when it continuously failed about 1-2 months ago
  • revert-3128-drop-keyword-support: I think that was used to give a contributor the possibility to amend to a already merged PR, but in the end a follow-up PR was used instead.
  • scipy19-docs and scipy19-docs-backup: these were merged last year (but turns out there are a few pending PRs that try to merge into scipy19-docs)

Edit: I'm going to delete those branches on Monday

@keewis
Copy link
Collaborator Author

keewis commented May 18, 2020

I removed all of them except fix-docs, which has 3 commits that are not marked with a PR number. After investigating, I think they are from:

so I'll delete fix-docs, too.

@keewis
Copy link
Collaborator Author

keewis commented May 18, 2020

now that every branch except accessor-documentation is gone, I'd say this is cleaned up

@keewis keewis closed this as completed May 18, 2020
@max-sixty
Copy link
Collaborator

Thanks @keewis ! Tab-completes in git will be easier now!

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

No branches or pull requests

2 participants