Slash Command1.3k repo starsupdated 3d ago

merge-conflict

Resolve a merge conflict

Install in Claude Code

Copy

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

Then start a new Claude Code session; the slash command loads automatically.

Definition

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.

More from this repository

loreSkill

SpecStory Lore - mine your SpecStory coding histories (any agent - Claude Code, Codex, Cursor, Gemini, and more) into a persistent corpus, surface your reproducible workflows with corroborated evidence, and interactively forge the chosen ones into skills installed across all your agent harnesses. Use when the user wants to turn past AI coding sessions into reusable skills, asks "what could I make into a skill", "mine my lore", "forge skills from my history", or points at a .specstory/history directory.

code-reviewSlash Command

Code review the current proposed code change

pr-reviewSlash Command

Code review for pull request $1

workthreadsSkill

SpecStory Workthreads - a weekly work-thread rollup across a team's repos from SpecStory coding histories (any agent - Claude Code, Codex, Cursor, Gemini, and more). It groups the window's sessions into threads of work per project and labels each new / open / recently closed, so a lead sees what shipped, what is still an open loop, and what was just started. Use when someone asks "what happened this week", "what is still open", "what did the team finish", "give me the weekly rollup", or wants a status report over a .specstory/history corpus.