resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Informations de source
- Dépôt
- FradSer/dotclaude
- Dernière activité de la source
- 23 septembre 2026 à 14:17
- Langue détectée de SKILL.md
- anglais
- Étoiles
- 593
- Forks
- 50
Options d'installation
Le prompt qui vérifie d'abord la source est sélectionné par défaut. Vous pouvez passer à une commande directe ou télécharger une copie locale.
Vérifiez les fichiers source
Lisez SKILL.md et les fichiers associés affichés par SkillsMP avant de décider de l'installer.
Explorateur de fichiers
2 fichiersAffichage de SKILL.md
SKILL.md
Instructions source · Aperçu en lecture seule- name
- resolving-merge-conflicts
- description
- Use when you need to resolve an in-progress git merge/rebase conflict.
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`.
## CRITICAL: Preserve intent, never invent
Understand the original intent of each change before resolving it. Do **not** invent new behaviour; where intents conflict, pick the one matching the merge's stated goal and note the trade-off. 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.
Voir sur GitHub