chore(*): fix improper @pull[bot] config (#9710)

Signed-off-by: Rongrong <i@rong.moe>
2026-09-24 23:12:34 +08:00 · 2022-05-05 20:35:19 -05:00
parent 4b3cb4a130
commit 4432bb0f19
2 changed files with 8 additions and 1 deletions
@@ -0,0 +1,7 @@
+version: '1'
+rules:
+  - base: master
+    upstream: diygod:master
+    # default value if this file does not exist is `hardreset`, effectively overwriting any downstream changes!
+    # previously it was the misconfigured PR route test workflow that rescued downstream changes from being overwritten
+    mergeMethod: merge