Skip to content

JetBrains/thinkrail / packages/pi-thinkrail-workflow/skills/shipping-a-pr

shipping-a-pr

Verified

Use when finished work needs to ship as a pull request, or when creating, syncing, updating metadata, checking status, monitoring CI, or addressing review comments on a PR. Not for reviewing a PR you are not shipping.

FileKindSize
SKILL.mdskill md4.2 KB
body.mdmarkdown1.3 KB
checks.mdmarkdown3.9 KB
creating.mdmarkdown4.7 KB
review-comments.mdmarkdown1.7 KB
screenshots.mdmarkdown2.8 KB
syncing.mdmarkdown1.6 KB

syncing.md

View on GitHub
# syncing.md — bring the PR up to date

Entry: an open PR has fallen behind its base or has conflicts. Saves nothing. Syncing preserves the
caller's completion mode and defaults to snapshot mode when entered directly; control continues at
`checks.md`.

1. `git fetch origin`, then rebase the branch onto the base — or merge, if the PR's existing
   history style is merge-based; follow what the PR already does.
2. Resolve conflicts by understanding both sides: read the conflicting hunks' history
   (`git log -p` on each side) before choosing. A mechanical "take ours" is how freshly merged
   work gets silently reverted.
3. **Reassess verification evidence.** Apply the spine's final-tree rule to the resulting change.
   Inspect conflict resolutions, relevant dependency changes, and base commits touching the change's
   behavior or test surface when deciding which gates were invalidated; use the full bar only when the
   base moved substantially enough to invalidate it. Changed commit ancestry alone does not force a
   rerun.
4. If step 3 causes a fix, commit it and repeat step 3 against the new head. Push only after evidence
   covers the final tree and `git status --porcelain` is empty (the spine's point-of-action rule).
   Use `--force-with-lease` after a rebase, never plain `--force`.

Red flags: "a rebase happened, so rerun everything" ignores valid evidence; "no conflicts, so every
old result still applies" ignores relevant behavior or dependency changes. Reassessing evidence is
unconditional; rerunning commands is not.

## Next

Read and follow `checks.md` in the selected completion mode.
receiving-code-reviewobra/superpowersUse when receiving code review feedback, before implementing suggestions, especially if feedback seems unclear or technically questionable - requires technical rigor and verification, not performative agreement or blind implementationStars: 322kUpdated Claude CodeCodexVerifiedInstall
requesting-code-reviewobra/superpowersUse when completing tasks, implementing major features, or before merging to verify work meets requirementsStars: 322kUpdated Claude CodeCodexVerifiedInstall
using-git-worktreesobra/superpowersUse when starting feature work that needs isolation from current workspace or before executing implementation plans - ensures an isolated workspace exists via native tools or git worktree fallbackStars: 322kUpdated Claude CodeCodexVerifiedInstall
verification-before-completionobra/superpowersUse when about to claim work is complete, fixed, or passing, before committing or creating PRs - requires running verification commands and confirming output before making any success claims; evidence before assertions alwaysStars: 322kUpdated Claude CodeCodexVerifiedInstall