From 3d8ba30ea0a4dfedcddcf11ecf2bf476cd1af4c3 Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Thu, 30 Jun 2022 18:01:08 -0400
Subject: chore: forward 1.23.2 to main (#15027)

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

(limited to 'tools/release')

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