Merge branch 'Onlineberatung:develop' into develop

virtualidentityag · Jul 8, 2022 · f7e37aa · f7e37aa
2 parents db8aca1 + e474431
commit f7e37aa
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/pull.yml b/.github/pull.yml
@@ -2,6 +2,6 @@ version: '1'
 rules:
     - base: develop
       upstream: Onlineberatung:develop
-      mergeMethod: squash
+      mergeMethod: merge
 label: ':arrow_heading_down: pull'
 conflictLabel: 'merge-conflict'