Skip to content

Decide: What merge-and-release Does When the Promotion Is Already Merged and a Release Was Asked #4019

Closed

Description

@ptr727

Split from tracker #3958, a CodeRabbit finding on ptr727/ESPHome-NonRoot#404 against the carried merge-and-release "The Procedure". Re-checked against hub main at 42f2155b.

Decision needed (tracker consolidation, 2026-11-09)

Question: Step 2 finds the promotion state=MERGED and says "Dispatch no release from here, since whoever merged it may have released it already". It then reports and stops. A session invoked with scope release therefore leaves the promotion unreleased when the other merger did not dispatch. What should it do?

Options, recommended first:

  1. Look, then ask (recommended): read the publisher's runs on the merge commit, and report whether a release started. Where none did, ask the maintainer before dispatching. The release request is not silently dropped, and no double dispatch is risked. No work in flight.
  2. Keep stop-and-report: simplest, and it relies on the report being read. No work in flight.

🤖 Generated with Claude Code

Activity

  1. added
    questionFurther information is requested
    decisionA question waiting on the maintainer, alone or beside whatever else the issue carries
    on Nov 9, 2026
  2. ptr727 commented on Nov 10, 2026

    @ptr727
    OwnerAuthor

    Answered by the maintainer, 2026-11-10: option 1, look, then ask. Where step 2 finds the promotion already merged under a release scope, read the publisher's runs on the merge commit and report whether a release started. Where none did, ask the maintainer before dispatching. This issue now tracks that edit to merge-and-release "The Procedure".

  3. removed
    decisionA question waiting on the maintainer, alone or beside whatever else the issue carries
    questionFurther information is requested
    on Nov 10, 2026
  4. ptr727 commented on Nov 10, 2026

    @ptr727
    OwnerAuthor

    Released (2026-11-10): PR #4029 merged into develop at 6a84ead, and its branch and worktree are removed, so this claim holds no files.

    Backlog burndown claim (attended run 2026-11-10, round 1, group G7). Branch: burndown/3897-merge-and-release-kit-install. Issues: #3897, #4019.

    Predicted file set:

    • .agents/skills/merge-and-release/SKILL.md
    • .github/skills/merge-and-release/SKILL.md
    • .claude-plugin/fleet-skills/skills/merge-and-release/SKILL.md
    • .claude-plugin/fleet-skills/.source-digests/merge-and-release

    No other group may edit these files while this claim stands. The orchestrator releases it at cleanup.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions