Change cherry-pick strategy

vgrassia · Oct 7, 2024 · e926ab3 · e926ab3
1 parent ae1d6c6
commit e926ab3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/workflows/repository-management.yml b/.github/workflows/repository-management.yml
@@ -207,20 +207,20 @@ 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:
             else
 
               # 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