From d9fa513425496f2c6fe3a0aeb5a0fe30b83de3ea Mon Sep 17 00:00:00 2001
From: Yep_Q <xiaoqi6pi@qq.com>
Date: Mon, 13 Oct 2025 22:32:12 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=B7=BB=E5=8A=A0=20git=20merge=20?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=B0=20Claude=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

详细说明:
- 更新 .claude/settings.local.json
- 添加 Bash(git merge:*) 到允许列表
- 影响模块: Claude Code 配置
---
 .claude/settings.local.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index a6afef46..c0f5338f 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -31,7 +31,9 @@
       "mcp__ide__getDiagnostics",
       "Bash(npm install:*)",
       "mcp__serena__read_memory",
-      "Bash(git add:*)"
+      "Bash(git add:*)",
+      "Bash(git merge:*)",
+      "Bash(git commit:*)"
     ],
     "deny": [],
     "ask": [],
@@ -51,4 +53,4 @@
     "feishu-api",
     "shadcn-ui-server"
   ]
-}
\ No newline at end of file
+}