From e926ab3cf72d1d28fb1d9205874dc5eef44a404d Mon Sep 17 00:00:00 2001
From: Vince Grassia <593223+vgrassia@users.noreply.github.com>
Date: Mon, 7 Oct 2024 18:54:51 -0400
Subject: [PATCH] Change cherry-pick strategy

---
 .github/workflows/repository-management.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/repository-management.yml b/.github/workflows/repository-management.yml
index 7840f0451bcd..ef20f383a8ee 100644
--- a/.github/workflows/repository-management.yml
+++ b/.github/workflows/repository-management.yml
@@ -207,12 +207,12 @@ jobs:
 
               # Chery-pick from 'rc' into 'hotfix-rc'
               git switch hotfix-rc
-              git cherry-pick --strategy=ours -x $RC_COMMIT
+              git cherry-pick --strategy=theirs -x $RC_COMMIT
               git push -u origin hotfix-rc
 
               # Cherry-pick from 'main' into 'rc'
               git switch rc
-              git cherry-pick --strategy=ours -x $MAIN_COMMIT
+              git cherry-pick --strategy=theirs -x $MAIN_COMMIT
               git push -u origin rc
 
             # If the 'rc' branch does not exist:
@@ -220,7 +220,7 @@ jobs:
 
               # Cherry-pick from 'main' into 'hotfix-rc'
               git switch hotfix-rc
-              git cherry-pick --strategy=ours -x $MAIN_COMMIT
+              git cherry-pick --strategy=theirs -x $MAIN_COMMIT
               git push -u origin hotfix-rc
 
             fi
@@ -230,7 +230,7 @@ jobs:
 
             # Cherry-pick from 'main' into 'rc'
             git switch rc
-            git cherry-pick --strategy=ours -x $MAIN_COMMIT
+            git cherry-pick --strategy=theirs -x $MAIN_COMMIT
             git push -u origin rc
 
           fi