diff options
| author | denobot <33910674+denobot@users.noreply.github.com> | 2022-07-05 21:14:22 +0530 |
|---|---|---|
| committer | David Sherret <dsherret@users.noreply.github.com> | 2022-07-05 14:24:40 -0400 |
| commit | ef312e00504e1293b234f74c28f1cfc4fad4da9e (patch) | |
| tree | d186ec79c20595ffc112d667c23d29abf9576cc8 /tools/release | |
| parent | a919a5dd1167b79f267cbed7312b3a7d296d429f (diff) | |
1.23.3 (#15081)
Co-authored-by: David Sherret <dsherret@gmail.com>
Diffstat (limited to 'tools/release')
| -rwxr-xr-x | tools/release/04_post_publish.ts | 3 |
1 files changed, 2 insertions, 1 deletions
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); |