From eb7fa3cbf5998b9a35dc724efa448b02ea48e3e2 Mon Sep 17 00:00:00 2001
From: "Randal S. Harisch" <randal@endofday.com>
Date: Wed, 27 Sep 2023 15:36:18 -0600
Subject: [PATCH] chore: changed merge type

---
 triggertemplate/conversionengine-template.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/triggertemplate/conversionengine-template.yaml b/triggertemplate/conversionengine-template.yaml
index fdedf04..fcacdf4 100644
--- 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