chore: 添加 git merge 权限到 Claude 配置

详细说明:
- 更新 .claude/settings.local.json
- 添加 Bash(git merge:*) 到允许列表
- 影响模块: Claude Code 配置

.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"
   ]
-}
+}