resolving-merge-conflicts

Use when you need to resolve an in-progress git merge/rebase conflict, or when a merge, rebase, cherry-pick or pull leaves conflict markers. Spanish triggers: "conflicto", "conflictos", "resuelve el merge", "arregla el rebase", "tengo conflictos", "no puedo hacer merge".

Jump to install

Repository: astrxnomo/dotfiles
Last source activity: August 7, 2026 at 20:36
Detected SKILL.md language: English
Stars: 0
Forks: 0

Install options

The review-first prompt is selected by default. You can switch to a direct command or download a local copy.

Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.

A direct command skips the review prompt. Inspect the source before running it.

npx skills add https://github.com/astrxnomo/dotfiles --skill resolving-merge-conflicts

The command stays on one line. Scroll horizontally to inspect it before copying.

Prefer a local copy? Download the files currently available to SkillsMP.

Review the source files

Read SKILL.md and any companion files shown by SkillsMP before deciding whether to install.

SKILL.md

Source instructions · Read-only preview

Back to search Back to installation

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. Spanish triggers: "arquitectura", "estructura del código", "cómo organizo", "dónde pongo", "refactor", "refactoriza", "acoplado", "separar responsabilidades", "capas", "módulo", "interfaz".

2026-08-07

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. Spanish triggers: "no funciona", "está roto", "falla", "da error", "revienta", "tira error", "se cae", "no anda", "por qué no", "está lento", "diagnostica", "depura", "arregla el bug", "no me sale".

2026-08-07

domain-modeling

Build and sharpen a project's domain model — the CONTEXT.md glossary and the ADRs in docs/adr/. 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. Spanish triggers: "glosario", "cómo llamamos a", "terminología", "nombres del dominio", "modelo de dominio", "documenta la decisión", "ADR", "deja constancia de por qué".

2026-08-07

View all from this repository

name	resolving-merge-conflicts
description	Use when you need to resolve an in-progress git merge/rebase conflict, or when a merge, rebase, cherry-pick or pull leaves conflict markers. Spanish triggers: "conflicto", "conflictos", "resuelve el merge", "arregla el rebase", "tengo conflictos", "no puedo hacer merge".

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

resolving-merge-conflicts

Source facts

Install options

Review the source files

More from this repository

More from this repository