From 2b3541941e13dceb5f24c2b7a41f4bcb505e8167 Mon Sep 17 00:00:00 2001 From: catlog22 Date: Fri, 24 Oct 2025 17:07:10 +0800 Subject: [PATCH] fix(conflict-resolution): fix markdown formatting errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix formatting issues: - Line 104-117: Replace escaped backticks (\`\`\`) with proper markdown code fence (```) - Line 158: Remove unnecessary backslash escapes from inline code - Line 182: Fix stray backslash before backtick in prompt template These formatting errors were causing markdown rendering issues. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- .claude/commands/workflow/tools/conflict-resolution.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.claude/commands/workflow/tools/conflict-resolution.md b/.claude/commands/workflow/tools/conflict-resolution.md index 1d7e159b..f3167cc3 100644 --- a/.claude/commands/workflow/tools/conflict-resolution.md +++ b/.claude/commands/workflow/tools/conflict-resolution.md @@ -101,7 +101,7 @@ Task( Execute conflict analysis using CLI tools: **Primary Tool - Gemini Analysis**: -\`\`\`bash +```bash cd {project_root} && gemini -p " PURPOSE: Analyze conflicts between plan and existing code TASK: @@ -114,7 +114,7 @@ CONTEXT: @{existing_files_pattern} @.workflow/{session_id}/**/* EXPECTED: Conflict list with severity and affected areas RULES: Focus on breaking changes and migration complexity " -\`\`\` +``` **Fallback - Qwen Analysis** (if Gemini unavailable): Same prompt structure, replace 'gemini' with 'qwen' @@ -155,7 +155,7 @@ For each detected conflict, generate 2-4 resolution options: ### Step 4: Generate CONFLICT_RESOLUTION.md Create comprehensive conflict resolution document: -**Output Location**: \`.workflow/{session_id}/.process/CONFLICT_RESOLUTION.md\` +**Output Location**: `.workflow/{session_id}/.process/CONFLICT_RESOLUTION.md` **Required Structure**: 1. **Executive Summary**: Total conflicts, severity distribution, overall risk @@ -179,7 +179,7 @@ Generate CONFLICT_RESOLUTION.md and report completion status: - Severity distribution: Critical: {N}, High: {N}, Medium: {N} - Resolution strategies: {total_options} - Output location: .workflow/{session_id}/.process/CONFLICT_RESOLUTION.md -\` +` ) ```