You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@couchdb.apache.org by "big-r81 (via GitHub)" <gi...@apache.org> on 2023/09/22 10:41:46 UTC
[GitHub] [couchdb] big-r81 opened a new pull request, #4772: Extending branch protection rules of .asf.yaml
big-r81 opened a new pull request, #4772:
URL: https://github.com/apache/couchdb/pull/4772
Add additional branch checks before merging a PR.
1. Require a linear history for better redability.
2. Disable "merge commits".
3. Require at least one approval.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@couchdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Extending branch protection rules of .asf.yaml [couchdb]
Posted by "rnewson (via GitHub)" <gi...@apache.org>.
rnewson commented on PR #4772:
URL: https://github.com/apache/couchdb/pull/4772#issuecomment-1745606437
I dislike the inability to do a merge commit. For larger pull requests I deliberately split them into multiple commits that are easy to review (at the time but, importantly, retrospectively). CouchDB may not be usable at each step, only before or after the set. Flattening these comments to form a fake linear history will lose that context, will yield broken builds at some of those comments, and the history does not actually reflect the history that the project took.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@couchdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add at least one approval before merging a PR [couchdb]
Posted by "big-r81 (via GitHub)" <gi...@apache.org>.
big-r81 merged PR #4772:
URL: https://github.com/apache/couchdb/pull/4772
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@couchdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add at least one approval before merging a PR [couchdb]
Posted by "pgj (via GitHub)" <gi...@apache.org>.
pgj commented on PR #4772:
URL: https://github.com/apache/couchdb/pull/4772#issuecomment-1944208718
Thanks @big-r81 for working on this!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@couchdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Extending branch protection rules of .asf.yaml [couchdb]
Posted by "big-r81 (via GitHub)" <gi...@apache.org>.
big-r81 commented on PR #4772:
URL: https://github.com/apache/couchdb/pull/4772#issuecomment-1746754778
Okay, than I would like to know, how others review commits.
For my side, I use the GH UI and check all changes (from all commits) as a whole and if it's a larger change, then I used the checkmark that I viewed the file. If no changes are made again (in the meantime) I would give my approval/request/comment ...
I think it's totally okay to give seperate commits during development, but if it should land in main, then it should be squashed to exactly one "atomic" commit. One feature/fix one commit. If something is wrong with that, it can be easily reverted or fixed.
This way would solve two of your hints. CouchDB is always usable after each commit and there are no "sub-feature/bug-commits" on the history. If a "sub-feature/bug" is important for history, then it should become an own commit.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@couchdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add at least one approval before merging a PR to .asf.yaml [couchdb]
Posted by "big-r81 (via GitHub)" <gi...@apache.org>.
big-r81 commented on PR #4772:
URL: https://github.com/apache/couchdb/pull/4772#issuecomment-1942175829
Hey, I updated the PR and removed the disabling of merge requests and the force of a linear history.
The only additional check is, that we need at least one approval to be allowed to merge the PR.
Nick @nickva, I had your approval before, but would like to get a new one (from others too). Maybe @rnewson has additional comments?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@couchdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org