diff options
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); |