Merge pull request #4 from CaritasDeutschland/VIC-795

feat: [VIC-795] fork sync change
Onlineberatung · Jun 10, 2022 · a3ebe60 · a3ebe60
2 parents ff40ada + fd454f6
commit a3ebe60
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/.github/pull.yml b/.github/pull.yml
@@ -1,7 +1,10 @@
 version: '1'
 rules:
+    - base: master
+      upstream: Onlineberatung:master
+      mergeMethod: squash
     - base: develop
-      upstream: Onlineberatung:develop # Required. Can be a branch in the same forked repo.
-      mergeMethod: squash # Optional, one of [none, merge, squash, rebase, hardreset], Default: none.
-label: ':arrow_heading_down: pull' # Optional
-conflictLabel: 'merge-conflict' # Optional, on merge conflict assign a custom label, Default: merge-conflict
+      upstream: Onlineberatung:develop
+      mergeMethod: squash
+label: ':arrow_heading_down: pull'
+conflictLabel: 'merge-conflict'