diff options
| -rwxr-xr-x | tools/release/04_post_publish.ts | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/tools/release/04_post_publish.ts b/tools/release/04_post_publish.ts index deadac80b..207a89a0e 100755 --- a/tools/release/04_post_publish.ts +++ b/tools/release/04_post_publish.ts @@ -51,13 +51,18 @@ async function forwardReleaseCommitToMain() { newBranchName, "origin/main", ]); - await repo.command([ + const cherryPickResult = await repo.command([ "git", "cherry-pick", - "--strategy-option", - "theirs", releaseCommitHash, - ]); + ]).noThrow(); + if (cherryPickResult.code !== 0) { + // commit with conflicts that can be resolved in the PR + await repo.command("git add ."); + await repo.command( + 'git commit --no-verify -m "Cherry-pick version bump commit with conflicts"', + ).noThrow(); + } await repo.gitPush("origin", newBranchName); $.logStep(`Opening PR...`); @@ -75,7 +80,13 @@ async function forwardReleaseCommitToMain() { $.log(`Opened PR at ${openedPr.data.url}`); function getPrBody() { - let text = + let text = ""; + + if (cherryPickResult.code !== 0) { + text += `**THIS PR HAS GIT CONFLICTS THAT MUST BE RESOLVED**\n\n`; + } + + text += `This is the release commit being forwarded back to main for ${cliCrate.version}\n\n` + `Please ensure:\n` + `- [ ] Everything looks ok in the PR\n` + |