跳到正文
cccskills
免费在 GitHub 公开

git-pr-recovery

Safely push recovered issue-scoped fixes onto an existing PR branch without disturbing a dirty local workspace.

中文简介正在准备中。当前显示原文说明。

查看安装方法

包含的文件(1)

  • SKILL.md1.7 KB

SKILL.md(原文)

安装前可以查看交给 AI 代理的指令内容。

Context

Use this when the right code already exists in a dirty local branch, but the real PR branch on origin is missing those fixes and must be updated without overwriting unrelated local work.

Patterns

  • Create or reuse a dedicated worktree for the target PR branch instead of checking it out in the dirty workspace.
  • When a reviewer reports that a prerequisite PR is missing from main, verify with git fetch, git rev-parse origin/main, and git merge-base HEAD origin/main before rebasing; stale local refs can create a false blocker.
  • Copy only the issue-scoped files into the worktree, then validate there with the repo's normal build/test command before committing.
  • If the recovery also needs a visible review note and the PR is effectively under the same GitHub user account, post a regular PR comment instead of a formal approval review.
  • Record the recovery decision in .squad/decisions/inbox/ so the team knows the branch was repaired intentionally.

Examples

  • Source branch with repaired files: neo/pr-recovery-731-732
  • Target PR branch: issue-731-user-publisher-settings
  • Temporary safe workspace: .worktrees\issue-731-recovery
  • Visible GitHub note: PR #756 comment confirming recovery push + merge readiness

Anti-Patterns

  • Do not switch the dirty workspace to the PR branch just to move files.
  • Do not discard uncommitted recovery work after the push; preserve it until the branch lands.
  • Do not submit a formal PR approval when protocol calls for a plain comment instead.

评价

还没有评价。欢迎分享你的使用感受。

评论

无需登录即可发表。欢迎分享使用感受、提问,或说明在哪些环境下无法运行。

还没有评论。来写第一条吧。

提交后会立即公开。请勿填写邮箱、电话等个人信息。URL 最多 2 个。

0 / 1000 字

此表单受 reCAPTCHA 保护,适用 Google 的隐私权政策和服务条款。

同一仓库的技能

Standard collaboration patterns for all squad agents — worktree awareness, decisions, cross-agent communication

中文简介正在准备中。当前显示原文说明。

jguadagno/jjgnet-broadcast182026年8月4日 更新

Shared hard rules enforced across all squad agents

中文简介正在准备中。当前显示原文说明。

jguadagno/jjgnet-broadcast182026年8月4日 更新

Comprehensive AI prompt engineering safety review and improvement prompt. Analyzes prompts for safety, bias, security vulnerabilities, and effectiveness while providing detailed improvement recommendations with extensive frameworks, testing methodologies, and educational content.

中文简介正在准备中。当前显示原文说明。

jguadagno/jjgnet-broadcast182026年8月4日 更新

Migrate API controller scope checks to framework-enforced authorization policies while preserving ownership checks.

中文简介正在准备中。当前显示原文说明。

jguadagno/jjgnet-broadcast182026年8月4日 更新

Review API DTO implementations for contract/domain separation, mapping patterns, and REST compliance

中文简介正在准备中。当前显示原文说明。

jguadagno/jjgnet-broadcast182026年8月4日 更新

Register shared claims transformation and hierarchical role policies in the API without breaking existing scope enforcement.

中文简介正在准备中。当前显示原文说明。

jguadagno/jjgnet-broadcast182026年8月4日 更新

查看 jguadagno 的全部技能

报告此技能的问题