resolve-merge
Use when a merge or rebase has conflicts, including plans and chronicles with colliding names.
- License 许可
- Apache-2.0
- 最近更新
- 2026-11-14
- Stars
- ★ 1.6k
- Forks
- 491
01 前言 Front Matter
- name
- resolve-merge
- description
- Use when a merge or rebase has conflicts, including plans and chronicles with colliding names.
- allowed-tools
- Glob, Grep, Read, Bash, Edit, Write, AskUserQuestion
- user-invocable
- true
03 SKILL.md 正文
Resolve Merge Conflicts
- Verify
MERGE_HEADorREBASE_HEAD; otherwise stop withNo merge in progress. - Before any write, list conflicts and classify each as AUTO or JUDGMENT.
- AUTO requires mechanical proof; default to JUDGMENT. AUTO cases:
- Sides byte-identical (
git show :2:<f>vs:3:<f>) or differing only in whitespace/EOL → take either. - AU →
git add, butgit rmif its slug already exists in theirs under another name (duplicate). - Lock file → checkout one side, regenerate via the package manager.
CHANGELOG.md→ merge unique entries, dedupe, keep category order.
- Sides byte-identical (
- When an OURS-only
NNNN__plan or chronicle collides with a THEIRS number, keep THEIRS. Rename the OURS file toYYYY-MM-DD__<slug>.mdwith its own date and slug, and never give it a new number. Repair its paired record, research, and cross-references. When date names collide, reconcile the same task or give different tasks distinct slugs. - Show every conflict with file, code, action, and classification. Ask once: Approve / Modify / Abort. Abort writes nothing.
- Apply approved AUTO actions; report only counts and failures.
- For each JUDGMENT file, show exact OURS and THEIRS hunks plus the proposed merge. Ask Approve / Edit / Skip; Skip leaves it conflicted.
- A file failure stays conflicted and goes under
Skipped; continue with others. - Verify no tracked conflict markers, valid file names and references when relevant, and known build/lint checks.
- Report
N resolved: X AUTO, Y JUDGMENT; Skipped: …, then hand off to/commitwithout committing. Stop on failed checks.
On Codex, translate gates with codex-tools.md.
04 同仓库更多 Skills
worktable-review-with-annotations
Create, inspect, reply to, update, or resolve situated Worktable annotations. Use when feedback belongs to a Doc section, block, text range, or HTML Doc, or when the user asks to address existing review feedback and coordinate a requested artifact edit.
worktable-find-and-synthesize-context
Find, assess, and synthesize context from Worktable Docs and Records. Use when the user asks what a workspace contains, wants workspace-backed research, needs current facts reconciled across artifacts, or requests a cited synthesis without changing workspace state.
worktable-create-or-update-docs
Create, edit, rename, or maintain narrative Worktable Docs. Use for plans, decisions, briefs, notes, research syntheses, and other durable prose when the user requests a new artifact or a safe update to an existing one.
worktable-create-or-manage-records
Organize repeated structured information as durable Worktable Records. Use for research datasets, inventories, directories, pipelines, trackers, and other collections whose items need identity, fields, filtering, links, validation, or individual updates.
worktable-create-or-manage-interactive-html
Create or improve durable visual and interactive artifacts in Worktable. Use for dashboards, trackers, calculators, mini apps, slide presentations, and other requests that benefit from a polished HTML Doc.
worktable-collaborate-threads
Read, answer, and hand off messages through durable Worktable threads with users or other authenticated participants. Use when the user asks to check addressed messages, reply to a participant, continue a thread, request another agent's help, wait briefly for a response, or watch for comments and messages sent to the agent.