amazon.aws: temp turn on the merge strategy

Disable the `squash-merge` merge strategy just the time we land ansible-collections/amazon.aws#392
goneri · Jun 25, 2021 · 76fe702 · 76fe702
1 parent 368d608
commit 76fe702
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
@@ -9,7 +9,7 @@
 - project:
     name: github.com/ansible-collections/amazon.aws
     default-branch: main
-    merge-mode: squash-merge
+    merge-mode: merger-merge
     templates:
       - system-required
       - publish-to-galaxy