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

Clean up branch names #1571

Closed
benlk opened this issue Nov 13, 2018 · 6 comments
Closed

Clean up branch names #1571

benlk opened this issue Nov 13, 2018 · 6 comments

Comments

@benlk
Copy link
Collaborator

benlk commented Nov 13, 2018

Continuing from #1534:

In the Largo 1.0 family of branches, we have:

  • 1.0
  • master
  • develop

In the Largo 0.x family of branches, we have:

  • 0.5
  • 0.5-dev

The current stable Largo version is 0.6, in the 0.5 and 0.6-dev branches.

How should branches be named, moving forwards?

@benlk benlk added this to the 0.6.1 - Bugfixes milestone Nov 13, 2018
@benlk benlk modified the milestones: 0.6.1 - Bugfixes, 0.6.2 Dec 7, 2018
@benlk
Copy link
Collaborator Author

benlk commented Jun 25, 2019

As a replacement for 0.5-dev I propose trunk as described in https://twitter.com/glyph/status/1143621561653456896:

git is intuitive. like for example the main branch is called "master", like you know, when you have a tree growing out of the ground, and you have the one big branch in the ground, in the middle of the tree, that the other branches come from? the "master" of the tree? like that

A replacement name for 0.5 would be hard to find in the tree-trunk metaphor except as something like seed or pollen, so I propose release as a branch name to reflect 0.5's current role as the branch that's up-to-date with the latest tagged release.

@joshdarby
Copy link
Collaborator

@benlk I'm all for release as a branch name for the current tagged release branch. Also, trunk is a good idea. That's how SVN tags master branches too http://svnbook.red-bean.com/en/1.8/svn.tour.importing.html#svn.tour.importing.layout

@benlk
Copy link
Collaborator Author

benlk commented Jul 17, 2019

To do

@joshdarby
Copy link
Collaborator

@benlk The To do checklist is completed, but I'll let you delete the 0.5 and 0.5-dev branches after making sure the new setup looks ok.

@benlk
Copy link
Collaborator Author

benlk commented Jul 19, 2019

New setup looks okay; I'll change the branch protection settings (which I had forgotten about 'til now) to the new branches.

@benlk
Copy link
Collaborator Author

benlk commented Jul 19, 2019

Added branch protection rules:

  • trunk: prevent deletion, prevent force pushes
  • release: prevent deletion, prevent force pushes, only org and repo admins can push (which is everyone at INN)

@benlk benlk closed this as completed Jul 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants