From f595a06f3edf60606df2a49ebe795a6b6ba0c12a Mon Sep 17 00:00:00 2001
From: swrring <swrring@naver.com>
Date: Thu, 16 Apr 2026 11:39:42 +0900
Subject: [PATCH] =?UTF-8?q?fix(hook):=20SessionStart=20hook=20=EC=9E=90?=
 =?UTF-8?q?=EB=8F=99=20merge=20=EC=B6=94=EA=B0=80=20=E2=80=94=20resume?=
 =?UTF-8?q?=EB=A7=8C=EC=9C=BC=EB=A1=9C=20=EC=B5=9C=EC=8B=A0=20=EB=8F=99?=
 =?UTF-8?q?=EA=B8=B0=ED=99=94=20=EC=99=84=EB=A3=8C=20(PD=EB=8B=98=20?=
 =?UTF-8?q?=EC=A7=81=EC=A0=91=20=EC=A7=80=EC=8B=9C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

기존: git fetch + "merge 권장" 표시만 (PD님 수동 조치 필요)
변경: git fetch + git merge origin/main --no-edit 자동 실행
충돌 시 경고 메시지 표시. C16-1 3중 배치.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .claude/settings.json        | 2 +-
 개발실/.claude/settings.json | 2 +-
 기획실/.claude/settings.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.claude/settings.json b/.claude/settings.json
index 7b2a25e..5c4b8ea 100644
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -48,7 +48,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "git fetch origin 2>/dev/null; CHANGES=$(git log --oneline HEAD..origin/main 2>/dev/null | head -10); if [ -n \"$CHANGES\" ]; then echo '📌 [SessionStart] origin/main 변경 검출:'; echo \"$CHANGES\"; echo '→ 권장: git merge origin/main --no-edit'; else echo '✅ [SessionStart] main 동기화 상태'; fi"
+            "command": "git fetch origin 2>/dev/null; CHANGES=$(git log --oneline HEAD..origin/main 2>/dev/null | head -10); if [ -n \"$CHANGES\" ]; then echo '📌 [SessionStart] origin/main 변경 검출 — 자동 병합 중:'; echo \"$CHANGES\"; git merge origin/main --no-edit 2>/dev/null && echo '✅ 자동 병합 완료' || echo '⚠️ 자동 병합 실패 (충돌 발생 — 수동 해결 필요)'; else echo '✅ [SessionStart] main 동기화 상태'; fi"
           },
           {
             "type": "command",
diff --git a/개발실/.claude/settings.json b/개발실/.claude/settings.json
index 7b2a25e..5c4b8ea 100644
--- a/개발실/.claude/settings.json
+++ b/개발실/.claude/settings.json
@@ -48,7 +48,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "git fetch origin 2>/dev/null; CHANGES=$(git log --oneline HEAD..origin/main 2>/dev/null | head -10); if [ -n \"$CHANGES\" ]; then echo '📌 [SessionStart] origin/main 변경 검출:'; echo \"$CHANGES\"; echo '→ 권장: git merge origin/main --no-edit'; else echo '✅ [SessionStart] main 동기화 상태'; fi"
+            "command": "git fetch origin 2>/dev/null; CHANGES=$(git log --oneline HEAD..origin/main 2>/dev/null | head -10); if [ -n \"$CHANGES\" ]; then echo '📌 [SessionStart] origin/main 변경 검출 — 자동 병합 중:'; echo \"$CHANGES\"; git merge origin/main --no-edit 2>/dev/null && echo '✅ 자동 병합 완료' || echo '⚠️ 자동 병합 실패 (충돌 발생 — 수동 해결 필요)'; else echo '✅ [SessionStart] main 동기화 상태'; fi"
           },
           {
             "type": "command",
diff --git a/기획실/.claude/settings.json b/기획실/.claude/settings.json
index 7b2a25e..5c4b8ea 100644
--- a/기획실/.claude/settings.json
+++ b/기획실/.claude/settings.json
@@ -48,7 +48,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "git fetch origin 2>/dev/null; CHANGES=$(git log --oneline HEAD..origin/main 2>/dev/null | head -10); if [ -n \"$CHANGES\" ]; then echo '📌 [SessionStart] origin/main 변경 검출:'; echo \"$CHANGES\"; echo '→ 권장: git merge origin/main --no-edit'; else echo '✅ [SessionStart] main 동기화 상태'; fi"
+            "command": "git fetch origin 2>/dev/null; CHANGES=$(git log --oneline HEAD..origin/main 2>/dev/null | head -10); if [ -n \"$CHANGES\" ]; then echo '📌 [SessionStart] origin/main 변경 검출 — 자동 병합 중:'; echo \"$CHANGES\"; git merge origin/main --no-edit 2>/dev/null && echo '✅ 자동 병합 완료' || echo '⚠️ 자동 병합 실패 (충돌 발생 — 수동 해결 필요)'; else echo '✅ [SessionStart] main 동기화 상태'; fi"
           },
           {
             "type": "command",