potiuk commented on code in PR #36472: URL: https://github.com/apache/airflow/pull/36472#discussion_r1437819923
########## .asf.yaml: ########## @@ -44,37 +44,47 @@ github: main: required_pull_request_reviews: required_approving_review_count: 1 + required_linear_history: true + required_conversation_resolution: true v1-10-stable: required_pull_request_reviews: required_approving_review_count: 1 v2-0-stable: required_pull_request_reviews: required_approving_review_count: 1 + required_linear_history: true v2-1-stable: required_pull_request_reviews: required_approving_review_count: 1 + required_linear_history: true v2-2-stable: required_pull_request_reviews: required_approving_review_count: 1 + required_linear_history: true v2-3-stable: required_pull_request_reviews: required_approving_review_count: 1 + required_linear_history: true v2-4-stable: required_pull_request_reviews: required_approving_review_count: 1 + required_linear_history: true v2-5-stable: required_pull_request_reviews: - required_approving_review_count: 1 + required_approving_review_count: 1 + required_linear_history: true v2-6-stable: required_pull_request_reviews: - required_approving_review_count: 1 + required_approving_review_count: 1 + required_linear_history: true v2-7-stable: required_pull_request_reviews: - required_approving_review_count: 1 + required_approving_review_count: 1 + required_linear_history: true v2-8-stable: required_pull_request_reviews: - required_approving_review_count: 1 - + required_approving_review_count: 1 + required_linear_history: true Review Comment: Protection works when you want to modify a branch - it does not go back to ancient history in the past. https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches#require-linear-history But yes - we always have exclusively linear history - we never allowed merges. in the "release" branches. It makes reasoning about history, cherry-picking, reverting about milion times easier and it also allows for very clear accountability (the change that gets merged is responsible for resolving all kind of conflicts. full stop) . -- 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: commits-unsubscr...@airflow.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org