maintain-fork-pr-merge SKILL.md skillA
maintain-fork-pr-merge from mambo-wang/codewiki-plus is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add mambo-wang/codewiki-plus/maintain-fork-pr-merge@git:20260907.dbc5ef9Pins git:20260907.dbc5ef9 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- mambo-wang/codewiki-plus
- Path
repowiki/skills/maintain-fork-pr-merge/SKILL.md- Versions recorded
- 2
- Latest version
- git:20260907.dbc5ef9, committed Sep 7, 2026
- First version recorded
- Sep 6, 2026
- Size
- 3,541 bytes
- Repository stars
- 21
- License
- MIT
当合入 fork 来源的 PR 且 mergeStateStatus=CONFLICTING/DIRTY 时——先 git merge-tree 探测冲突清单，查 maintainer_can_modify，再在 worktree 隔离目录解冲突后 push fork 分支，勿因 CI 绿直接 merge.
Collected from public GitHub. Every version is saved exactly as it was and never changes. Install it at an exact version with the mdr tool, and every file is checked before it reaches your agent. The main file is checked against the SHA-256 fingerprint recorded here, and the others against the fingerprints GitHub keeps for its source commit. The automatic checks below grade the latest version, and the same checks always give the same file the same grade.
What the file says
## 工作场景 维护者合入外部贡献者从 fork 发起的 PR，且 PR 分支与目标分支存在冲突（mergeStateStatus=CONFLICTING/DIRTY）。本仓的典型情境：评审期间 develop 又合入了新提交，导致 fork PR 的改动与主线重叠。 ## 适用条件 - PR 的 head 分支在贡献者 fork 仓库中（isCrossRepository=true），本地 `git fetch <pr-branch>` 会 404 - `gh pr view --json mergeable,mergeStateStatus` 显示 CONFLICTING 或 DIRTY - 注意：此时 CI 检查可能是全绿——CI 通过不等于可合并，以 mergeStateStatus 为准 - mergeStateStatus=DRAFT（CI 未跑完）时先等结果再探测冲突，勿提前判定 ## 核心 SOP 1. 探测冲突清单：`git merge-tree --write-tree --name-only <base> <head>`——无需真实 checkout/merge 即可拿到冲突文件列表 2. 确认可否代改：`gh pr view --json isCrossRepository,headRepository`；fork PR 合入前查 `gh api repos/<owner>/<repo>/pulls/<n> --jq .maintainer_can_modify`——为 false 时只能请作者解决或换合并策略 3. 隔离解冲突：工作区有未提交改动时，用 `git worktree add <tmp> <head> -b <branch>` 在独立目录解决冲突，不污染主工作区 4. 更新 PR 分支：冲突解决后 `git push https://github.com/<fork-owner>/<repo>.git <local-branch>:<pr-branch>`（maintainer_can_modify=true 时 GitHub 允许维护者推 fork 的 PR head） 5. 收尾清理：`git worktree remove --force` + `git branch -D`，再 `gh pr merge --merge` ## 判断逻辑 - mergeStateStatus=DIRTY ≠ CI 失败：先看冲突字段，不要先怪 CI - 主工作区是否常驻未提交改动决定是否必须走 worktree：常驻则必须隔离 - maintainer_can_modify 是代改的前提闸门：false 时一切 push fork 方案不可行 ## 禁忌与反模式 …
Read the whole file at its exact version.
How to install
mdr add mambo-wang/codewiki-plus/maintain-fork-pr-merge@sha256:16d2d8e44d54a441The line at the top of this page pins the label git:20260907.dbc5ef9, which is what most people want. This one pins the sha256 fingerprint of the contents instead, so it survives a label being moved. Either way the exact version is written to mdr.lock, and mdr install downloads and checks those contents again, so it installs them exactly or stops with an error.
[](https://markdownregistry.com/a/art_nbryjv2stvktfvo3)
3 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 2 versions of this file, between Sep 6, 2026 and Sep 7, 2026, more than one a day.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20260907.dbc5ef9 latest | 2026-09-07 | dbc5ef9 | 3,541 B | A | view · diff |
| git:20260906.b368cc6 | 2026-09-06 | b368cc6 | 3,540 B | A | view |
Audit of the latest version
- pass: Frontmatter block present
- pass: Frontmatter declares a name
- pass: Frontmatter declares a description
- pass: Size between 200 bytes and 200 KB (3541 bytes)
- pass: No zero-width or bidi control characters
- pass: No instruction hidden inside an HTML comment
- pass: No link to an exfiltration or paste host
- pass: No credential-shaped string
- pass: No instruction to send local credentials anywhere
- pass: No text hidden with inline styles
- pass: No prompt-injection phrasing
- pass: No curl or wget piped into a shell
- pass: No recursive delete of root, home or parent
- pass: No instruction to read or print local credentials
- pass: No base64 blob over 200 characters
- pass: No link to a raw IP address
- pass: No script tag
Source
mambo-wang/codewiki-plus · 21 stars · license MIT · pushed 2026-11-02 · branch develop
API
GET https://markdownregistry.com/api/v1/artifacts/art_nbryjv2stvktfvo3 GET https://markdownregistry.com/api/v1/resolve?ref=mambo-wang/codewiki-plus/maintain-fork-pr-merge GET https://markdownregistry.com/api/v1/blob/16d2d8e44d54a441fc9d7d2f0af4bfaf8c68a5862539c6a2bc83092181cccff4
Your AI assistant does the legwork. You hear about the deals worth your word. Hand yours the standing instructions at modelranch.com and it joins the network that reads files like this one.
Guides: the SKILL.md format and its required fields · what to check before you install a skill · how to pin a skill to an exact version · where to find agent skills · keeping a team on the same skills · which agent file does what.
More from mambo-wang/codewiki-plus
Every file in mambo-wang/codewiki-plus