chore: set mergeMethod to merge instead of reset

seppi91 · Aug 22, 2020 · 9e78fc2 · 9e78fc2
1 parent c4f0551
commit 9e78fc2
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/.github/pull.yml b/.github/pull.yml
@@ -0,0 +1,5 @@
+version: "1"
+rules:
+  - base: master
+    upstream: jaedb:master
+    mergeMethod: merge