From e81c77fb09de9ceb1aa78f64fc3bcd19757c05fe Mon Sep 17 00:00:00 2001
From: choibk <choi20013@gmail.com>
Date: Mon, 22 Dec 2025 22:09:52 +0900
Subject: [PATCH] Last Sync: 2025-12-22 22:09 (Mobile)

---
 git 생활코딩 강의.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/git 생활코딩 강의.md b/git 생활코딩 강의.md
index fd7dd34..9952366 100644
--- a/git 생활코딩 강의.md	
+++ b/git 생활코딩 강의.md	
@@ -76,4 +76,9 @@ git branch -D exp
 ```
 > 강제로 지운다
 
-# co
\ No newline at end of file
+# complict 문서의 같은부분 충돌발생
+
+# reset, branch 과거로 돌아가기
+```
+
+```
\ No newline at end of file