Merge pull request #441 from goneri/Revert-amazon.aws-temporarily-use…

…-the-merge-strategy_547 Revert "amazon.aws: temporarily use the merge strategy" This reverts commit 166da1c483820b3ca4736b46b00a6883d150889f.
ansible · Sep 9, 2022 · 7e11e2b · 7e11e2b
2 parents 5d4ab7b + ed7aa18
commit 7e11e2b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
@@ -48,7 +48,7 @@
 - project:
     name: ansible-collections/amazon.aws
     default-branch: main
-    merge-mode: merge
+    merge-mode: squash-merge
     templates:
       - system-required
       - publish-to-galaxy