其他

resolve-pr-conflicts

Name: resolve-pr-conflicts
Author: jssblck

jssblck/agents

Use when a PR has merge conflicts with its base branch, including conflicts found during babysitting or merging.

安装命令

$ npx skills add https://github.com/jssblck/agents --skill resolve-pr-conflicts

SKILL.md

Update the PR's own branch against its current base. This skill does not authorize merging the PR or retargeting it to another base.

gh pr view <n> -R <owner/repo> --json state,headRefName,headRefOid,baseRefName,mergeable,isCrossRepository,maintainerCanModify

Confirm the PR is open and record its head SHA and base branch.
Work in a temporary worktree, preserving existing local edits.
Fetch the PR head and base from their actual repositories; record the base tip.
Confirm fork permissions and the destination remote before updating the PR branch.
Merge or rebase onto the fetched base according to the repository's guidance.