util script update

rubrikinc · Oct 13, 2024 · 0488079 · 0488079
1 parent c1a7c7c
commit 0488079
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Utils/admin/Update-RscSdkMainBranch.ps1 b/Utils/admin/Update-RscSdkMainBranch.ps1
@@ -48,6 +48,10 @@ catch {
     throw "Failed to checkout 'main' branch."
 }
 
+# CHANGELOG.md can be a source of conflict so we check it out manually
+git checkout $sourceBranch -- CHANGELOG.md
+# Same with RubrikSecurityCloud.psd1
+git checkout $sourceBranch -- RubrikSecurityCloud\RubrikSecurityCloud.PowerShell\RubrikSecurityCloud.psd1
 # Merge $sourceBranch into main without commit
 try {
     git merge $sourceBranch --no-commit --no-ff