potiuk commented on code in PR #36472: URL: https://github.com/apache/airflow/pull/36472#discussion_r1437820834
########## .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: The way how we do v2-x branches is that we always cherry-pick individual commits - there is no "merging" - just cherry-picking that creates a linear history for each branch beceuse those cherry-picked commits are separate "instances" of the same commit not merges (though they keep reference + PR# in the subjects so it's 100% trackable where they came from). -- 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