[sentry-junior]

Follow-up to #964. When Craft can't merge the release branch back, it now fails the publish instead of logging a warning. That way the failure shows up in getsentry/publish and can be retried or recovered from there.

The toolkit cli/0.48.0 publish (job log) is the motivating case. Every target shipped, but the merge hit a conflict. Craft warned and reported success, so the run was green while the release branch stayed unmerged and postReleaseBump was skipped. Someone had to read the logs to notice. getsentry/toolkit#2028 cleans up that release.

What changed

• When handleReleaseBranch fails with a merge conflict, a push failure, or any other error, craft publish now throws ReleaseBranchMergeError. The error says every target published and lists the conflicting files and the diff. It also says how to recover:
  • merge the target branch into the release branch and push it, so the retry merges the new head, or
  • merge the release branch into the target branch yourself with a merge commit (not a squash), so the retry is a no-op merge plus cleanup.
• The publish state file is kept, so the retry skips the published targets and only merges. In getsentry/publish, the issue checkboxes already do the same, so re-adding accepted retries only the merge.
• The post-release bump and the post-release command are skipped. They run on the successful retry.
• BranchCleanupError stays a warning, because the merge was already pushed and a retry can't help.
• Sentry reporting now goes through the global error handler, instead of a captureException call in the merge path.

This reverses the earlier decision that the merge is non-blocking housekeeping. I updated .lore.md and the release-workflow docs to match.

Verification

• New publishMain tests: a merge conflict and a push failure both reject with ReleaseBranchMergeError and keep the state file, and a failed merge skips the bump. The existing cleanup-failure test still passes as a warning.
• pnpm lint and tsc pass, and the src/commands and resolver tests pass (91 tests). In the full pnpm test, the only failures are the same e2e failures (24 in prepare-dry-run.e2e and one other file) that I also see on master in my sandbox.

Companion: getsentry/publish#10269 fixes the getsentry/publish failure comment. That comment says "Bad branch? You can delete with ease and start over", which is the wrong advice once targets have published, because the version is already out. It now lists the done targets and says to retry by re-adding accepted.

via @BYK.

--

View Session in Sentry

[github-actions]

PR Preview Action v1.8.1
Preview removed because the pull request was closed.
2026-11-05 21:33 UTC

[BYK]

Not changed: the getsentry/publish failure comment still says "Bad branch? You can delete with ease and start over". For a merge failure that's the wrong advice: deleting the branch makes the retry fail with "Could not find the release branch".

Let's file an issue to fix this with useful advice