From dc5fe67040017be3c9c3b6374750bdd7dbb6bd26 Mon Sep 17 00:00:00 2001
From: Bhavin Patel <bpatel@splunk.com>
Date: Wed, 20 Mar 2024 21:59:30 +0000
Subject: [PATCH] Github updated via CI (NOT tag)

---
 pipeline/.release.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pipeline/.release.yml b/pipeline/.release.yml
index 9bc79984fa..22fe7a54dc 100644
--- a/pipeline/.release.yml
+++ b/pipeline/.release.yml
@@ -204,9 +204,12 @@ github_push_develop:
     - git remote add github_origin git@github.com:splunk/security_content.git
     - git fetch github_origin
     - git checkout -b $BRANCH
-    - git merge github_origin/develop -X theirs
+    - git config merge.submodule ignore
+    - git merge github_origin/develop -X theirs || true
+    - cd contentctl && git checkout main && cd ..
+    - git add contentctl
     - cd contentctl/
-    - poetry run contentctl -p ../ --enable_enrichment build
+    - poetry run contentctl -p ../ build --enable_enrichment
     - poetry run contentctl -p ../ --enable_enrichment build -t ssa
     - poetry run contentctl -p ../ --enable_enrichment build -t api
     - cd ..