用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
直接命令不会经过审查 Prompt；运行前请先检查来源。
npx skills add https://github.com/Abd0r/porcupineai --skill github-pr-conflicts命令会保持在同一行。复制前请横向滚动并检查完整内容。
想先保存到本地？可下载 SkillsMP 当前能够提供的文件。
Write code that does not look like AI output. Reject low-evidence and low-signal TypeScript patterns (chained assertions, unknown/object widening, Reflect, runtime typeof, module mocks) in favor of typed, boundary-checked code.
Control a Home Assistant smart home through its MCP server. Query sensor and entity states read-only, then act on devices (lights, switches, climate) via call_service with explicit user approval. Use for "turn off the living room lights", "what is the thermostat set to", "set bedroom temp", or any Home Assistant entity/device task.
Produce clear, accessible diagrams and charts (architecture, flow, sequence, ER, state, org, Gantt, timeline) as Mermaid or polished self-contained SVG. Covers picking the right diagram type, a consistent visual system, and accessibility. Use whenever you need to explain a system, a flow, data, or a process in a README, doc, benchmark report, plan, or launch graphic.
基于 SOC 职业分类
正在显示 SKILL.md
| name | github-pr-conflicts |
| description | Resolve PR merge conflicts in isolated worktrees. |
| stack | vcs |
| tags | ["github","conflicts","merge","rebase","pr"] |
PR is CONFLICTING / dirty vs base. Not a substitute for code review.
github-auth. Push access to the PR head branch (or fork). Prefer an isolated worktree so a dirty main checkout stays untouched.
git status --short --branch
git remote -v
gh pr view N --repo OWNER/REPO \
--json headRefName,headRefOid,headRepository,headRepositoryOwner,baseRefName,mergeable,mergeStateStatus
Record the real headRefName and head repo — never invent the publish branch.
git fetch origin
BASE=$(gh pr view N --repo OWNER/REPO --json baseRefName -q .baseRefName)
HEAD_BRANCH=$(gh pr view N --repo OWNER/REPO --json headRefName -q .headRefName)
git fetch origin "$BASE" "pull/N/head:refs/remotes/origin/pr-N"
git worktree add ../repo-pr-N -b fix/pr-N-conflicts origin/pr-N
cd ../repo-pr-N
git merge "origin/$BASE"
# or: git rebase "origin/$BASE"
# resolve with read/edit
git status
git add path/to/file
git merge --continue
# or: git rebase --continue
Conflict rules:
git push origin HEAD:"$HEAD_BRANCH"
# fork heads may need:
# git push git@github.com:FORK_OWNER/REPO.git HEAD:"$HEAD_BRANCH"
gh pr view N --repo OWNER/REPO --json mergeable,mergeStateStatus,headRefOid
gh pr checks N --repo OWNER/REPO
cd -
git worktree remove ../repo-pr-N