Skip to content

feat: unify backport flow with merge-train infrastructure#20973

Open
ludamad wants to merge 12 commits intonextfrom
ad/backport-unification
Open

feat: unify backport flow with merge-train infrastructure#20973
ludamad wants to merge 12 commits intonextfrom
ad/backport-unification

Conversation

@ludamad
Copy link
Collaborator

@ludamad ludamad commented Feb 27, 2026

  • backport trains are now exactly merge trains
  • we commit to backport trains with conflict markers

ludamad and others added 5 commits February 27, 2026 14:55
… multi-label loop, conflict Slack to #backports)
…ort detection, remove stale auto-merge invocation, fix printf format string
…o PR, simplify backport.yml script invocation
- Remove racy train PR link from comment (PR may not exist yet when
  merge-train-create-pr.yml hasn't run); use backtick branch name instead
- Update ClaudeBox prompt to lead with /backport invocation so the skill
  is triggered directly, with context explaining the CONFLICTS: commit
- Polish SKILL.md: rm redundant grep suggestion, strengthen worktree note

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@ludamad ludamad force-pushed the ad/backport-unification branch from 04506b5 to e059551 Compare February 27, 2026 19:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant