[Bug] Bash tool hangs indefinitely on git merge command, requires kill -9

Bug Description

Bash tool hangs indefinitely on git merge command (macOS, kill -9 required)

Environment

• Claude Code: 2.1.47
• OS: macOS 26.3 (ARM64 / Apple Silicon)
• Terminal: Ghostty
• Shell: zsh

Description

Bash tool hangs indefinitely when executing git checkout develop && git merge --no-ff ....
The UI shows "Running…" then transitions to "Lollygagging…" and never completes.

This has occurred twice with the same command pattern.

Symptoms

• git command actually completes successfully (no lock files, merge applied)
• Claude Code never receives the result and stays in "Running…" / "Lollygagging…"
• Ctrl+C has no effect
• kill <pid> (SIGTERM) has no effect
• Only kill -9 (SIGKILL) terminates the process

Reproduction

1. Run Claude Code with claude -c
2. Have Claude execute: git checkout develop && git merge --no-ff <branch> -m "..."
3. Command completes in git but Claude Code hangs

Notes

• The git operation itself succeeded — no .git/index.lock, no MERGE_HEAD
• The process had MCP servers running (playwright, angular CLI) as child processes
• Process was in S+ (sleeping, foreground) state
• Happened twice in the same session with the same command

Environment Info

• Platform: darwin
• Terminal: ghostty
• Version: 2.1.47
• Feedback ID: ec05a7a5-56d8-4a84-8fff-646e77cbfcdd

Errors

[{"error":"Error: NON-FATAL: Lock acquisition failed for /Users/yusuke/.local/share/claude/versions/2.1.47 (expected in multi-process scenarios)\n    at jVR (/$bunfs/root/claude:3483:2098)\n    at WMA (/$bunfs/root/claude:3483:1209)\n    at processTicksAndRejections (native:7:39)","timestamp":"2026-02-19T01:10:48.868Z"}]