ci: replaced squash merge with merge

virtualidentityag · Jul 8, 2022 · 11826e6 · 11826e6
1 parent f3f1144
commit 11826e6
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'