From 0404a7eb7ca854fdbabbc5e63462f48f51cb3241 Mon Sep 17 00:00:00 2001 From: catlog22 Date: Sat, 8 Nov 2025 12:07:45 +0800 Subject: [PATCH] =?UTF-8?q?docs:=20=E5=A2=9E=E5=BC=BA=20conflict-resolutio?= =?UTF-8?q?n=20=E6=A0=B8=E5=BF=83=E8=A7=84=E5=88=99=EF=BC=8C=E7=A6=81?= =?UTF-8?q?=E6=AD=A2=E4=BD=BF=E7=94=A8=20bash=20=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加核心职责规则：直接文本输出，禁止使用 bash echo/printf 命令 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- .claude/commands/workflow/tools/conflict-resolution.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.claude/commands/workflow/tools/conflict-resolution.md b/.claude/commands/workflow/tools/conflict-resolution.md index 9c65bbe2..8d41ad5d 100644 --- a/.claude/commands/workflow/tools/conflict-resolution.md +++ b/.claude/commands/workflow/tools/conflict-resolution.md @@ -24,6 +24,7 @@ Analyzes conflicts between implementation plans and existing codebase, generatin | **Generate Strategies** | Provide 2-4 resolution options per conflict | | **CLI Analysis** | Use Gemini/Qwen (Claude fallback) | | **User Decision** | Present options, never auto-apply | +| **Direct Text Output** | Output questions via text directly, NEVER use bash echo/printf | | **Single Output** | `CONFLICT_RESOLUTION.md` with findings | ## Conflict Categories