Menü
Rebase onto latest upstream, checking for soft conflicts
Mit Codex oder Claude installieren Kopieren Sie diesen Prompt, fügen Sie ihn in Codex, Claude oder einen anderen Assistant ein und lassen Sie die Skill-Seite prüfen und installieren.
Basierend auf der SOC-Berufsklassifikation
Check whether this card's code meets the acceptance criteria
Run a quick UX/UI workshop using ASCII-art sketches
Write automated tests for unticked scenarios in this card's test cases
Review code changes on this card for likely bugs, regressions, and missed edges
Cherry-pick post-merge commits onto a new follow-up branch
Maintain a support docs pack — dedup, length budgets, and no splintering — and land changes as a reviewed pull request. Use when a support thread, or a hand-off from Support assist, surfaces a new resolution, a correction to an existing one, or a deployment quirk worth recording. Not for ordinary code changes.
| name | git-update |
| description | Rebase onto latest upstream, checking for soft conflicts |
| label | Update |
| workhorse-version | 0.2.0 |
Rebase this card's branch onto its upstream. The upstream is the parent branch this card was based on — usually main, but cards that depend on a parent card rebase onto the parent's branch instead. Determine the actual branch names from git rev-parse --abbrev-ref HEAD (the card branch) and git rev-parse --abbrev-ref @{upstream} (the base). Use those exact refs, not the workspace default.
git fetch origin to refresh remote refs, then verify the fetch updated the upstream by comparing git rev-parse origin/<base-branch> before and after — if the SHA didn't change but git ls-remote origin <base-branch> reports a different SHA, abort and report the discrepancy rather than rebasing onto stale stategit rebase origin/<base-branch> to rebase onto the upstreamgit push --force-with-lease origin <card-branch> so the remote reflects the rebased historyWhen local changes are small, the soft-conflict check can be brief. When local changes are large, examine thoroughly.