From ef312e00504e1293b234f74c28f1cfc4fad4da9e Mon Sep 17 00:00:00 2001
From: denobot <33910674+denobot@users.noreply.github.com>
Date: Tue, 5 Jul 2022 21:14:22 +0530
Subject: 1.23.3 (#15081)

Co-authored-by: David Sherret <dsherret@gmail.com>
---
 tools/release/04_post_publish.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools/release')

diff --git a/tools/release/04_post_publish.ts b/tools/release/04_post_publish.ts
index 75bc19925..4555b445e 100755
--- a/tools/release/04_post_publish.ts
+++ b/tools/release/04_post_publish.ts
@@ -55,7 +55,8 @@ async function forwardReleaseCommitToMain() {
   await repo.runCommand([
     "git",
     "cherry-pick",
-    "-Xpatience",
+    "--strategy-option",
+    "theirs",
     releaseCommitHash,
   ]);
   await repo.gitPush("origin", newBranchName);
-- 
cgit v1.2.3