Community程式設計與開發github.com

mattpocock/解決合併衝突

當需要解決進行中的 git 合併/重定基底衝突時使用。

解決合併衝突 是什麼?

這項技能提供了一個系統化的方法來解決 git 合併或重定基底衝突。它引導使用者從了解當前衝突狀態開始,然後深入分析每項變更的原始意圖與來源(如提交訊息、PR、議題)。接著,它指導如何逐塊解決衝突,在可能的情況下保留雙方的意圖,如果衝突無法相容,則選擇與合併目標一致的一方,並記錄取捨。最後,技能要求執行專案的自動化檢查(型別檢查、測試、格式化),並完成合併或重定基底流程,絕不建議使用 `--abort` 放棄。此技能適用於任何使用 Git 的開發環境,如 Claude Code、Cursor 或 Codex,能有效減少衝突解決的混亂與風險。

相容平台~Claude Code~Codex CLI~Cursor
npx skills add https://github.com/mattpocock/skills/tree/main/skills/engineering/resolving-merge-conflicts

Installed? Explore more 程式設計與開發 skills: steipete/bluebubbles, steipete/eightctl, steipete/blucli · View all 6 →

在你喜歡的 AI 中提問

開啟一個已預先載入此 Agent Skill 的新對話。

說明文件

  1. 查看當前狀態 了解合併/重定基底的狀況。檢查 git 歷史記錄以及衝突的檔案。

  2. 找出每個衝突的主要來源 深入理解每個變更的原因與原始意圖。閱讀提交訊息、檢查 Pull Request、查閱原始議題/票證。

  3. 解決每個衝突區塊 在可能的情況下保留雙方的意圖。如果衝突不相容,選擇與合併目標一致的一方,並記錄取捨。不要創造新的行為。始終解決衝突;絕不 --abort。

  4. 發現專案的自動化檢查並執行它們——通常先執行型別檢查,然後測試,最後格式化。修復合併造成的任何問題。

  5. 完成合併/重定基底 暫存所有檔案並提交。如果正在重定基底,請繼續重定基底流程,直到所有提交都完成重定基底。

Individual skills in this repo

This repo contains 20 individual skills — each has its own dedicated page.

mattpocock/ask-matt

Ask which skill or flow fits your situation. A router over the skills in this repo.

mattpocock/caveman

Ultra-compressed communication mode. Cuts token usage ~75% by dropping filler, articles, and pleasantries while keeping full technical accuracy. Use when user says "caveman mode", "talk like caveman", "use caveman", "less tokens", "be brief", or invokes /caveman.

mattpocock/claude-handoff

Hand the current conversation off to a fresh background agent that picks up the work immediately.

mattpocock/codebase-design

Shared vocabulary for designing deep modules. Use when the user wants to design or improve a module's interface, find deepening opportunities, decide where a seam goes, make code more testable or AI-navigable, or when another skill needs the deep-module vocabulary.

mattpocock/design-an-interface

Generate multiple radically different interface designs for a module using parallel sub-agents. Use when user wants to design an API, explore interface options, compare module shapes, or mentions "design it twice".

mattpocock/diagnose

Disciplined diagnosis loop for hard bugs and performance regressions. Reproduce → minimise → hypothesise → instrument → fix → regression-test. Use when user says "diagnose this" / "debug this", reports a bug, says something is broken/throwing/failing, or describes a performance regression.

mattpocock/diagnosing-bugs

Diagnosis loop for hard bugs and performance regressions. Use when the user says "diagnose"/"debug this", or reports something broken/throwing/failing/slow.

mattpocock/domain-modeling

Build and sharpen a project's domain model. Use when the user wants to pin down domain terminology or a ubiquitous language, record an architectural decision, or when another skill needs to maintain the domain model.

mattpocock/edit-article

Edit and improve articles by restructuring sections, improving clarity, and tightening prose. Use when user wants to edit, revise, or improve an article draft.

mattpocock/git-guardrails-claude-code

Set up Claude Code hooks to block dangerous git commands (push, reset --hard, clean, branch -D, etc.) before they execute. Use when user wants to prevent destructive git operations, add git safety hooks, or block git push/reset in Claude Code.

mattpocock/grilling

Grill the user relentlessly about a plan or design. Use when the user wants to stress-test a plan before building, or uses any 'grill' trigger phrases.

mattpocock/grill-me

Interview the user relentlessly about a plan or design until reaching shared understanding, resolving each branch of the decision tree. Use when user wants to stress-test a plan, get grilled on their design, or mentions "grill me".

mattpocock/grill-with-docs

Grilling session that challenges your plan against the existing domain model, sharpens terminology, and updates documentation (CONTEXT.md, ADRs) inline as decisions crystallise. Use when user wants to stress-test a plan against their project's language and documented decisions.

mattpocock/handoff

Compact the current conversation into a handoff document for another agent to pick up.

mattpocock/implement

Implement a piece of work based on a PRD or set of issues.

mattpocock/implement-spec

Implement a specification in code.

mattpocock/improve-codebase-architecture

Scan a codebase for deepening opportunities, present them as a visual HTML report, then grill through whichever one you pick.

mattpocock/loop-me

Grill me about specs for the workflows I want to build, within this workspace.

mattpocock/migrate-to-shoehorn

Migrate test files from `as` type assertions to @total-typescript/shoehorn. Use when user mentions shoehorn, wants to replace `as` in tests, or needs partial test data.

mattpocock/obsidian-vault

Search, create, and manage notes in the Obsidian vault with wikilinks and index notes. Use when user wants to find, create, or organize notes in Obsidian.

相關技能