From cb0534e8e91d5d59b19ed5918519f5b496b09670 Mon Sep 17 00:00:00 2001
From: happybell80 <happybell80@naver.com>
Date: Thu, 4 Sep 2025 15:46:41 +0900
Subject: [PATCH] =?UTF-8?q?docs:=20Git=20pull.rebase=20=EC=84=A4=EC=A0=95?=
 =?UTF-8?q?=20=EC=99=84=EB=A3=8C=20=EA=B8=B0=EB=A1=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- git config --global pull.rebase false 적용
- merge 전략으로 통일
- 적용 대상: 51123 admin, 51124 admin, happybell80
---
 plans/250831_todo_and_tech_debt.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plans/250831_todo_and_tech_debt.md b/plans/250831_todo_and_tech_debt.md
index 9ac396f..e0f290a 100644
--- a/plans/250831_todo_and_tech_debt.md
+++ b/plans/250831_todo_and_tech_debt.md
@@ -137,6 +137,11 @@ class UserIdentityService:
 - **Frontend**: VITE_AUTH_SERVER_URL 환경변수 사용 중
 - **auth-server**: .env 파일로 관리 중
 
+### Git 설정
+- **pull.rebase**: false 설정 완료 (2025-09-04)
+- **전략**: merge 방식으로 통일
+- **적용 범위**: 51123 admin, 51124 admin, happybell80
+
 ## 4. 250831 작업 요약
 
 ### 완료된 작업 ✅