Merge pull request #1058 from LalatenduMohanty/mergify_auto_rebase

mergify: add auto-rebase and conflict notification rules

Author: LalatenduMohanty

.mergify.yml

@@ -77,3 +77,23 @@ pull_request_rules:
     actions:
       merge:
         method: merge
+
+  - name: Auto-rebase approved PRs that are behind
+    conditions:
+      - "-draft"
+      - "-conflict"
+      - "#commits-behind>0"
+      - "base=main"
+      - "#approved-reviews-by>=1"
+    actions:
+      rebase:
+
+  - name: Ping author on conflicts
+    conditions:
+      - "conflict"
+      - "-closed"
+    actions:
+      comment:
+        message: |
+          This pull request has merge conflicts that must be resolved before it can be merged.
+          @{{ author }} please rebase your branch.