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

Add "working branches" section to Committer-Conventions #1219

Closed
jim-krueger opened this issue Feb 12, 2024 · 12 comments
Closed

Add "working branches" section to Committer-Conventions #1219

jim-krueger opened this issue Feb 12, 2024 · 12 comments

Comments

@jim-krueger
Copy link
Contributor

jim-krueger commented Feb 12, 2024

In an effort to allow for accelerated development and prototype work for the proposed release-3.2 effort I’d like to add the following section to our Committer Conventions. I initially sent this as a note in the mailing list and have made a few adjustments.

Please vote and/or add suggestions.

Working Branches

Occasionally there may be a need for the community to collaborate and develop changes for the purposes of prototyping etc. In those cases a “working branch” may be created that will be managed with exceptions to the conventions stated above:

What is a Working Branch?

  • A working branch is a branch created for accelerated development and prototyping purposes
  • A branch must receives 3 committer +1 votes (and no -1 votes) before being designated as a working branch.
  • A working branch does not correspond directly to any documented release plan.
  • Content in a working branch will need full approval via the Committer Conventions above before being added to the master/release/main branch or any branch corresponding to a documented release plan.

Exceptions to Committer Conventions for Working Branches

(1) There will be no minimum wait time to merge / close PRs.

(2) PRs may be merged / closed following review and approval by at least one committer (other than the submitter themself).

@jamezp
Copy link
Contributor

jamezp commented Feb 12, 2024

+1 this makes sense to me.

@mkarg
Copy link
Contributor

mkarg commented Feb 12, 2024

+-0: I do not have objections, but I do not actively support any weakening of the committer rules.

@jim-krueger
Copy link
Contributor Author

jim-krueger commented Feb 13, 2024

I don't see this as a weakening of the committer rules since any and all changes that would be placed in the master/main or any branch corresponding to an active release plan would need to follow the established committer rules. This would only be allowing our group to collaborate quickly on a separate working branch. An advantage being that the entire group will be exposed to the prototyping work being done, rather than having those involved working separately to avoid being held up by the current process.

@jansupol
Copy link
Contributor

+0: I can see the urge for this for 3.2, but for other non-urged branches I feel relaxed about having extra time, especially during the summer vacation time.

@jim-krueger
Copy link
Contributor Author

jim-krueger commented Feb 14, 2024

I can see the urge for this for 3.2, but for other non-urged branches I feel relaxed about having extra time, especially during the summer vacation time.

@jansupol I've added the following above. Does that possibly change your vote?

  • A branch must receives 3 committer +1 votes (and no -1 votes) before being designated as a working branch.

Here is an example of why this is needed. PR 1217 changes the spec and therefore (per the current Committer Conventions) it cannot be merged for another week even though it has been approved. This would also apply to any PR that changed any API. This makes prototype collaboration very slow.

@jansupol
Copy link
Contributor

+1 if there is a list of current working branches, possibly in the Readme or on Wiki

@jim-krueger
Copy link
Contributor Author

jim-krueger commented Feb 14, 2024

if there is a list of current working branches, possibly in the Readme or on Wiki

Good idea. As soon as this passes I will add a list to the wiki and add a link to it in the Committer Conventions.

@asoldano
Copy link

+1, this looks ok to me

@jim-krueger
Copy link
Contributor Author

So for there have been 3 - +1 votes including two committers beyond myself and 1 - 0 votes. If there are no -1 votes by next Tuesday (February 20th) I will add the above to our Committer Conventions. Thanks

@jimma
Copy link
Contributor

jimma commented Feb 18, 2024

+1, this looks good .

@spericas
Copy link
Contributor

+1

@jim-krueger
Copy link
Contributor Author

I've added the new section to the Committer Conventions.

Closing issue

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

7 participants