diff --git a/.asf.yaml b/.asf.yaml
index 7be9658d8..bb886b472 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -32,11 +32,11 @@ github:
     - graph
     - client
     - tool
-    
+  # enable rebase for co-working pr
   enabled_merge_buttons:
     merge:  false
-    rebase: false
     squash: true
+    rebase: true
   protected_branches:
     master:
       required_status_checks: