ci(mergify): disable auto-rebasing due to Mergifyio/mergify#5074

DanySK · Mar 13, 2023 · 3e1059d · 3e1059d
1 parent 7e5118a
commit 3e1059d
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -19,23 +19,23 @@ pull_request_rules:
       - -conflict
     actions:
       update:
-  - name: rebase-merge working updates
-    conditions:
-      - and:
-          - or: *authors_are_bots
-          - and:
-              - or:
-                  - check-success=ci-cd / success
-                  - check-neutral=ci-cd / success
-                  - check-skipped=ci-cd / success
-              - "#review-threads-unresolved=0"
-              - "#commits-behind=0"
-      - label=dependencies
-      - -draft
-      - -conflict
-    actions:
-      merge:
-        method: rebase
+#   - name: rebase-merge working updates
+#     conditions:
+#       - and:
+#           - or: *authors_are_bots
+#           - and:
+#               - or:
+#                   - check-success=ci-cd / success
+#                   - check-neutral=ci-cd / success
+#                   - check-skipped=ci-cd / success
+#               - "#review-threads-unresolved=0"
+#               - "#commits-behind=0"
+#       - label=dependencies
+#       - -draft
+#       - -conflict
+#     actions:
+#       merge:
+#         method: rebase
   - name: ask to resolve conflict
     conditions:
       - conflict