resolve-conflicts
Use when you need to resolve an in-progress git merge, rebase, or cherry-pick conflict — <<<<<<< markers are present, or git status shows unmerged paths.
- License 许可
- Apache-2.0
- 所属仓库
- zak-keown/moe
- 最近更新
- 2026-09-05
- Stars
- ★ 0
- Forks
- 1
01 前言 Front Matter
- name
- resolve-conflicts
- description
- Use when you need to resolve an in-progress git merge, rebase, or cherry-pick conflict — <<<<<<< markers are present, or git status shows unmerged paths.
03 SKILL.md 正文
Resolving Merge Conflicts
Work through merge or rebase conflicts hunk by hunk, preserving both sides' intent. Always resolve; never abort.
1. See the current state
git status # unmerged paths
git diff --name-only --diff-filter=U # just the conflicting files
git log --merge --oneline # commits involved in the conflict
Read the conflicting files. Understand the shape: how many files, how many hunks, whether the conflicts are textual (overlapping edits) or structural (file renamed on one side, edited on the other).
2. Research intent from primary sources
For each conflict, understand why each side made its change before touching the markers. Read:
- The commit messages on both sides (
git log --merge -p) - PR/MR descriptions if available (
gh pr view,glab mr view) - The original issue or ticket if referenced
The goal is to know each side's intent, not just its diff. Two hunks that look incompatible often serve the same goal from different starting points.
3. Resolve each hunk
- Preserve both intents where possible — most conflicts are additive, not contradictory.
- When intents are incompatible, pick the one that matches the merge's stated goal (the branch being merged into wins on convention; the feature branch wins on purpose). Note the trade-off in the commit message.
- Do not invent new behaviour. A conflict resolution combines or chooses; it does not redesign. If the resolution needs new code, that is a follow-up commit, not part of the merge.
--ours/--theirsshortcuts — usegit checkout --ours <file>orgit checkout --theirs <file>only when one side's change is entirely superseded and you have confirmed this from the primary sources. Never use them to skip reading the conflict.
4. Verify
Run the project's automated checks in order: typecheck, then tests, then
format. Fix whatever fails before continuing — per merge-discipline, this
is not limited to what the merge itself broke. A failure that predates the
conflict, or lives on the other side's changes, is still yours to fix once
you're the one doing the merge. The resolution owns correctness, not a
follow-up commit.
5. Finish
git add <resolved files>
git merge --continue # or: git rebase --continue
If rebasing, repeat from step 1 for each subsequent commit that conflicts until the rebase completes.
Common Rationalizations
| Thought | Reality |
|---|---|
| "Just take ours" | That silently drops the other side's intent. Read the source first. |
| "Just take theirs" | Same problem in reverse. |
| "I'll abort and start over" | The same conflict will reappear. Resolve it now. |
| "The conflict is too complex, let me rewrite this section" | A merge resolution combines or chooses. New code is a follow-up commit. |
| "The tests pass, so the resolution is correct" | Tests passing is necessary but not sufficient. The intent check (step 2) catches semantic regressions tests miss. |
| "That failure was already there before the conflict" | Doesn't matter — see merge-discipline. You're merging, so you own the result. |
04 同仓库更多 Skills
write-skill
Use when creating new skills, editing existing skills, or verifying skills work before deployment
write-plan
Use when you have a spec or requirements for a multi-step task, before touching code
write-clearly
Apply Strunk's timeless writing rules to ANY prose humans will read—documentation, commit messages, error messages, explanations, reports, or UI text. Makes your writing clearer, stronger, and more professional.
windows-vm
Create, manage, or connect to a headless Windows 11 VM running in Docker with SSH access. Use when the user wants to spin up, stop, restart, or SSH into a Windows VM.
verify-completion
Use when about to claim work is complete, fixed, or passing, before committing or creating MRs - requires running verification commands and confirming output before making any success claims; evidence before assertions always
using-moe
Use when starting any conversation - establishes how to find and use skills, requiring skill invocation before ANY response including clarifying questions