Resolving Merge Conflicts

依据双方原始意图解决正在进行的Git合并或变基冲突。 English: Use when you need to resolve an in-progress git merge/rebase conflict.

hyhyxyx Updated

File contents

[!IMPORTANT] 中文 Codex 适配: 执行本技能前,必须完整读取 references/CODEX-ZH.md。下面保留上游方法论的完整内容;兼容规则只增加中文交互、Codex 调用、Windows 工具映射和授权边界。

  1. See the current state of the merge/rebase. Check git history, and the conflicting files.

  2. 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.

  3. Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never --abort.

  4. Discover the project's automated checks and run them, typically typecheck, then tests, then format. Fix anything the merge broke.

  5. Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

hyhyxyx/matt-skills-zh-codex/tree/main/.agents/skills/resolving-merge-conflicts commit 870923f041

Frequently asked questions

npx skillmds@latest add hyhyxyx/resolving-merge-conflicts