chore: changed merge type

2023-09-27 15:36:18 -06:00
parent 159122084d
commit eb7fa3cbf5
1 changed files with 1 additions and 1 deletions
--- a/triggertemplate/conversionengine-template.yaml
+++ b/triggertemplate/conversionengine-template.yaml
@@ -52,7 +52,7 @@ spec:
        - name: git-token-secret-key
          value: password
        - name: git-merge-type
-          value: squash
+          value: merge
        - name: git-merge-delete-branch
          value: True
        - name: git-helm-url