Skip to content

fix: mark stacked PRs so repair can find them - #38

Merged
lemarier merged 1 commit into
mainfrom
lemarier/stacked-pr-marker
Sep 27, 2026
Merged

lemarier merged 1 commit into
mainfrom
lemarier/stacked-pr-marker

Conversation

@lemarier

Copy link
Copy Markdown
Contributor

Change

Follow-up to #37, which merged before this commit reached the branch. A stacked PR now carries a Stacked on #<lower PR> body line, and repair treats a stacked PR as stale when that lower PR has merged and its merge commit is not in the head. With squash merges and branch deletion, GitHub retargets the upper layer to main while it still carries the lower layer's original commits, so it may not show as conflicting; the body line is how a later pass finds it. The local issue coordinator job and pr-conflict-precheck.sh already follow this rule.

Validation

  • just check: tests, link, and JSON checks passed.
  • Tested the Stacked on #N parsing on sample PR bodies and the compare API's ahead/behind status on real commits.

https://claude.ai/code/session_01E9psw1USAWcT2Vtmcfbgsa

Copilot AI lite review requested due to automatic review settings September 27, 2026 19:39

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Sep 27, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-09-27T19:41:16.681659Z ca43acc PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@coderabbitai

coderabbitai Bot commented Sep 27, 2026

Copy link
Copy Markdown

Review in Change Stack →

Navigate logical layers of code changes, visualize relationships, and explore their blast radius.

Note

Currently processing new changes in this PR. This may take a few minutes, please wait...

⚙️ Run configuration

Configuration used: Organization UI

Review profile: QUIET

Plan: Advanced

Run ID: d3266ed3-3b45-4d47-b862-c438c667ef4a

📥 Commits

Reviewing files that changed from the base of the PR and between 2f2a567 and ca43acc.

📒 Files selected for processing (1)
  • skills/origin89-orca/references/unattended-run.md

Comment @coderabbitai help to get the list of available commands.

@lemarier
lemarier merged commit c394158 into main Sep 27, 2026
5 of 6 checks passed
@lemarier
lemarier deleted the lemarier/stacked-pr-marker branch September 27, 2026 19:41
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.

2 participants