Skip to main content
ClaudeWave
Slash Command1.3k estrellas del repoactualizado 2d ago

merge-conflict

Resolve a merge conflict

Instalar en Claude Code
Copiar
mkdir -p ~/.claude/commands && curl -fsSL https://raw.githubusercontent.com/specstoryai/getspecstory/HEAD/specstory-cli/.claude/commands/merge-conflict.md -o ~/.claude/commands/merge-conflict.md
Después abre una sesión nueva de Claude Code; el slash command carga automáticamente.

merge-conflict.md

## Context

- Current git status: !`git status`
- Current git diff: !`git diff`

## Your task

Examine the current merge conflict using git commands.

Review each issue conflict by conflict and explain what caused each conflict. Explain what each side of the conflict was attempting to accomplish with their change. 

Importantly, make a suggestion for the best resolution for each conflict, but only resolve them in discussion with me.

Use file names and line numbers to reference the changes, but also sequentially number every observation so we can easily reference them.