Skip to content

docs: gh pr update-branch --rebase + BEHIND detection in PR workflow#79

Merged
CybotTM merged 1 commit into
mainfrom
feat/pr-update-branch-rebase
Jun 27, 2026
Merged

docs: gh pr update-branch --rebase + BEHIND detection in PR workflow#79
CybotTM merged 1 commit into
mainfrom
feat/pr-update-branch-rebase

Conversation

@CybotTM

@CybotTM CybotTM commented Jun 24, 2026

Copy link
Copy Markdown
Member

Adds two field-tested PR-maintenance notes to references/pull-request-workflow.md (Conflict Resolution section).

gh pr update-branch <n> --rebase — remote-rebase a conflict-free PR onto its base with no local clone and no merge commit (rebase-only compatible). Only succeeds when mergeable: MERGEABLE; force-updates the branch (re-triggers CI, can reset approvals), so reserve it for PRs staleness actually blocks. Handy for a bulk 'rebase all my open PRs' sweep.

Judging 'behind' correctly — GitHub only reports mergeStateStatus: BEHIND when the base enforces 'require branches up to date'; otherwise a PR many commits behind still shows CLEAN/BLOCKED. Use gh api .../compare/<base>...<head> --jq .behind_by to know the real distance, and don't rebase conflict-free-but-behind PRs unless staleness blocks merge.

Content-only append to an existing reference file already in the SKILL.md index. markdownlint clean.

🤖 Generated with Claude Code

Document remote-rebasing a conflict-free PR onto its base without a local
clone (no merge commit, rebase-only compatible), and that mergeStateStatus
only reports BEHIND when the base enforces up-to-date branches — otherwise
use the compare API's behind_by to judge staleness.

Signed-off-by: Sebastian Mendel <info@sebastianmendel.de>
Copilot AI review requested due to automatic review settings June 24, 2026 21:07
@gemini-code-assist

Copy link
Copy Markdown

Warning

You have reached your daily quota limit. Please wait up to 24 hours and I will start processing your requests again!

@github-actions

Copy link
Copy Markdown
Contributor

Dependency Review

✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.

Scanned Files

None

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.

@CybotTM CybotTM merged commit d69c991 into main Jun 27, 2026
17 of 18 checks passed
@CybotTM CybotTM deleted the feat/pr-update-branch-rebase branch June 27, 2026 07:25
@sonarqubecloud

Copy link
Copy Markdown

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