catlog22/Claude-Code-Workflow
1
0
Fork 0
mirror of https://github.com/catlog22/Claude-Code-Workflow.git synced 2026-02-10 02:24:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(conflict-resolution): fix markdown formatting errors

Browse Source 
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 <noreply@anthropic.com>
This commit is contained in:
catlog22
2025-10-24 17:07:10 +08:00
parent 04373ee368
commit 2b3541941e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.claude/commands/workflow/tools/conflict-resolution.md
View File

@@ -101,7 +101,7 @@ Task(
Execute conflict analysis using CLI tools: Execute conflict analysis using CLI tools:
**Primary Tool - Gemini Analysis**: **Primary Tool - Gemini Analysis**:
\`\`\`bash ```bash
cd {project_root} && gemini -p " cd {project_root} && gemini -p "
PURPOSE: Analyze conflicts between plan and existing code PURPOSE: Analyze conflicts between plan and existing code
TASK: TASK:
@@ -114,7 +114,7 @@ CONTEXT: @{existing_files_pattern} @.workflow/{session_id}/**/*
EXPECTED: Conflict list with severity and affected areas EXPECTED: Conflict list with severity and affected areas
RULES: Focus on breaking changes and migration complexity RULES: Focus on breaking changes and migration complexity
" "
\`\`\` ```
**Fallback - Qwen Analysis** (if Gemini unavailable): **Fallback - Qwen Analysis** (if Gemini unavailable):
Same prompt structure, replace 'gemini' with 'qwen' 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 ### Step 4: Generate CONFLICT_RESOLUTION.md
Create comprehensive conflict resolution document: 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**: **Required Structure**:
1. **Executive Summary**: Total conflicts, severity distribution, overall risk 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} - Severity distribution: Critical: {N}, High: {N}, Medium: {N}
- Resolution strategies: {total_options} - Resolution strategies: {total_options}
- Output location: .workflow/{session_id}/.process/CONFLICT_RESOLUTION.md - Output location: .workflow/{session_id}/.process/CONFLICT_RESOLUTION.md
\` `
) )
``` ```