菜单
Use when a git merge or rebase is stopped mid-way with conflicting files. Triggers on: "merge conflict", "rebase conflict", "CONFLICT (content)", "fix these conflicts", "continue the rebase".
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
Use when the user wants a high-stakes decision debated by independent perspectives and synthesized into a verdict — five advisors (Contrarian, First Principles, Expansionist, Outsider, Executor) answer independently, peer-review anonymously, then a chairman synthesizes. Triggers on: "council this", "convene the council", "run a council on", "rerun the council", "I want the council to debate this", "five independent perspectives", "have advisors weigh in and peer-review each other".
Use when the user wants a plan, proposal, or conclusion adversarially challenged in one pass — auto-picks the strongest critique mode (socratic, dialectic, pre-mortem, red-team, evidence audit) and delivers the 3–5 strongest challenges plus a synthesis. Triggers on: "court-jester this", "poke holes in this plan", "red-team this design", "run a pre-mortem", "argue the other side", "does the evidence actually support this conclusion", "challenge this proposal".
Use when interacting with a Gitea instance or its `tea` CLI — listing or filing issues, managing pull requests, labels, milestones, releases, repos, or calling the Gitea REST API. Triggers on: "tea" CLI commands, "Gitea", "tea issues", "tea pr", "tea api", blocked-by/issue dependencies, "file this on the tracker", or a repo whose remote points at a Gitea host. Excludes GitHub's `gh` CLI.
Use when documentation must stay truthful as software changes — writing or revising a spec, ADR, runbook, or API/config reference, splitting user-facing docs by purpose, or reconciling documentation drift. Triggers on: "write a spec", "ADR", "runbook", "which docs must change", "documentation drift", "missing acceptance criteria", "spec interview", "update the API reference".
Use when the project's domain model is being changed — terms pinned down, design decisions landing, vocabulary conflicting — or when another skill needs to maintain the domain model while decisions land. Triggers on: "pin down the terminology", "ubiquitous language", "record this decision", "add it to the glossary", "domain model".
Interactive QA session: the user reports bugs or issues conversationally, the agent clarifies, explores the codebase in the background for domain language, and files durable, user-focused issues on the project tracker. Triggers on: "QA session", "let's do QA", "file an issue for this", "report a bug", "log these bugs", "bug triage", or when the user describes problems they want captured as tracker issues rather than fixed immediately.
| name | resolving-merge-conflicts |
| description | Use when a git merge or rebase is stopped mid-way with conflicting files. Triggers on: "merge conflict", "rebase conflict", "CONFLICT (content)", "fix these conflicts", "continue the rebase". |
| license | MIT (adapted from mattpocock/skills) |
Always resolve; never --abort. Preserve the intent of both sides — do not invent new behaviour.
See the current state of the merge/rebase. Check git history, and the conflicting files.
Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets via the tracker doc's "fetch the relevant ticket" convention.
Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off.
Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
