diff --git a/.asf.yaml b/.asf.yaml
index 8b923c266b0..14e9e9f4c17 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -77,6 +77,7 @@ github:
         require_code_owner_reviews: false
         required_approving_review_count: 1
       required_linear_history: true
+      required_conversation_resolution: true
 
 notifications:
   commits:              commits@texera.apache.org