Copilot IDE

specstory-cli/.claude/commands/merge-conflict.md

@@ -0,0 +1,19 @@
+---
+allowed-tools: Bash(git status:*), Bash(git diff:*), Bash(grep:*), Bash(awk:*), Bash(sed:*)
+description: Resolve a merge conflict
+---
+
+## 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.