تشغيل أي مهارة في Manus بنقرة واحدة

ابدأ الآن

pr-restack

النجوم٢

التفرعات٢

آخر تحديث٦ يونيو ٢٠٢٦ في ٠١:٤٧

Restacks dependent branches after upstream rebase/merge/force-push changes. Use when a PR stack needs bases realigned.

التثبيت

التثبيت باستخدام Codex أو Claude انسخ هذا Prompt والصقه في Codex أو Claude أو مساعد آخر ليراجع صفحة Skill ويثبّتها لك.

تشغيل في Manus

المصدر

nanstey

nanstey/agentic-tools

فتح مستودع GitHub عرض مستودعات المنشئ

تنزيل

تشغيل في Manus

المهن ذات الصلةSOC

استنادا إلى تصنيف SOC المهني

مطوّرو البرمجياتمهن الحاسوب والرياضيات·SOC 15-1252

SKILL.md

readonly

name	pr-restack
description	Restacks dependent branches after upstream rebase/merge/force-push changes. Use when a PR stack needs bases realigned.

PR Restack

Rebase a dependent PR stack onto updated upstream branches while preserving each branch's unique commits.

Workflow

Gather inputs: stack order/top branch, known upstream changes, and merge style if known.
Fetch and map stack from PR metadata (headRefName, baseRefName, PR state).
Determine root base (bottom PR base) and fast-forward local root base to origin/<root-base>.
Detect drift per branch (upstream rewritten, merged, advanced, or removed commits).
Build a per-branch plan: current base, new base, commits kept/dropped, risks, lease SHA.
Present plan and wait for explicit user approval.
Create backup refs for every branch before rewriting.
Execute bottom-up restack:
- checkout/reset branch to origin/<branch>,
- delegate rebase mechanics to /rebase (transplant mode when needed, push=false),
- let /conflicts handle pauses,
- refresh lockfile when package manifests/lockfile changed,
- run typecheck before push,
- verify branch shape (range-diff, branch log) against plan,
- force-push with strict lease only.
Update PR base when branch targeting changed.
Report one-line result per branch plus backups and follow-ups.

Safety Rules

Never execute before user approves the plan.
Never use plain --force; use --force-with-lease.
Never rewrite branches without backup refs.
Never continue when branch base or intent is ambiguous.
Stop on non-trivial conflicts or unexpected commit drops and ask.
Do not proceed to next branch if current branch fails validation.

Output Style

Report root base used, plan approval status, per-branch old base -> new base and before -> after SHA, push status, updated PR bases, backups created, and unresolved risks.

المزيد من هذا المستودع

نفس المستودع

prototype

nanstey/agentic-tools

Build a throwaway prototype to answer a design question. Use when the user wants to sanity-check whether a state model or logic feels right, or explore what a UI should look like.

2026-07-092

pr-split

nanstey/agentic-tools

Splits a large branch or PR into smaller, independently reviewable units by grouping changes and proposing parallel PRs or a stacked series. Use when a changeset is too big to review well and should be broken up.

2026-07-082

pi-sync

nanstey/agentic-tools

Captures the portable, non-secret pi config from a live ~/.pi/agent into this repo's pi/ directory and commits it, without reading or copying secrets. Use when live pi config or extensions have drifted from the repo and need to be synced back.

2026-07-082

pr-description

nanstey/agentic-tools

Refreshes PR titles and descriptions to match the current branch changeset. Use when the PR title or body has drifted from the code.

2026-07-082

reflect

nanstey/agentic-tools

Reviews the current session for problems and their eventual fixes, then proposes durable improvements to repo skills, scripts, or docs that prevent recurrence. Use when a session hit avoidable friction worth turning into a lasting fix.

2026-07-072

proposal

nanstey/agentic-tools

Runs discovery and uncertainty resolution for a change, then writes a terse plan document covering purpose, behaviour, validation, architecture, and phased vertical slices. Use before building when a change needs a clear, agreed design.

2026-06-252

name	pr-restack
description	Restacks dependent branches after upstream rebase/merge/force-push changes. Use when a PR stack needs bases realigned.

PR Restack

Rebase a dependent PR stack onto updated upstream branches while preserving each branch's unique commits.

Workflow

Gather inputs: stack order/top branch, known upstream changes, and merge style if known.
Fetch and map stack from PR metadata (headRefName, baseRefName, PR state).
Determine root base (bottom PR base) and fast-forward local root base to origin/<root-base>.
Detect drift per branch (upstream rewritten, merged, advanced, or removed commits).
Build a per-branch plan: current base, new base, commits kept/dropped, risks, lease SHA.
Present plan and wait for explicit user approval.
Create backup refs for every branch before rewriting.
Execute bottom-up restack:
- checkout/reset branch to origin/<branch>,
- delegate rebase mechanics to /rebase (transplant mode when needed, push=false),
- let /conflicts handle pauses,
- refresh lockfile when package manifests/lockfile changed,
- run typecheck before push,
- verify branch shape (range-diff, branch log) against plan,
- force-push with strict lease only.
Update PR base when branch targeting changed.
Report one-line result per branch plus backups and follow-ups.

Safety Rules

Never execute before user approves the plan.
Never use plain --force; use --force-with-lease.
Never rewrite branches without backup refs.
Never continue when branch base or intent is ambiguous.
Stop on non-trivial conflicts or unexpected commit drops and ask.
Do not proceed to next branch if current branch fails validation.

Output Style

Report root base used, plan approval status, per-branch old base -> new base and before -> after SHA, push status, updated PR bases, backups created, and unresolved risks.