Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ github:

enabled_merge_buttons:
squash: true
merge: false
rebase: false
merge: true
rebase: true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is ok for now. As a community, we should make a goal by the end of the year to sign all commits for software supply chain verification (which means all merges would need to be done by CLI and not GH web page buttons)


del_branch_on_merge: true

protected_branches:
main:
required_pull_request_reviews:
require_code_owner_reviews: false
required_approving_review_count: 0
required_approving_review_count: 1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 -- agree we should have this for supply chain traceability.

required_linear_history: true
required_status_checks:
strict: false
Expand Down