From bbb6e6d6217fe52ed19fd8639f75723b5702b55d Mon Sep 17 00:00:00 2001 From: dayeongyu Date: Thu, 16 Oct 2025 11:35:39 +0900 Subject: [PATCH 1/4] hello --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index 42a89d3..ce01362 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -qwqwq +hello From c75a848e6b1537acfcd642b0f0c4a95a22cc4a43 Mon Sep 17 00:00:00 2001 From: dayeongyu Date: Thu, 16 Oct 2025 11:38:17 +0900 Subject: [PATCH 2/4] main_hi --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index 42a89d3..6dc1537 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -qwqwq +main_hello From 666dffab71113336f0012ee675bc30e4db874438 Mon Sep 17 00:00:00 2001 From: dayeongyu Date: Thu, 16 Oct 2025 11:41:46 +0900 Subject: [PATCH 3/4] modify test.txt --- test.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test.txt b/test.txt index f4713ce..3f3926c 100644 --- a/test.txt +++ b/test.txt @@ -1,5 +1,2 @@ -<<<<<<< HEAD main_hello -======= -hello ->>>>>>> mylocal +push_hello From 680d9339c628d9427a02989f456047408c66d7d9 Mon Sep 17 00:00:00 2001 From: qr3037kim3023-stack Date: Thu, 16 Oct 2025 11:50:33 +0900 Subject: [PATCH 4/4] Create new_file.txt --- new_file.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 new_file.txt diff --git a/new_file.txt b/new_file.txt new file mode 100644 index 0000000..44669ee --- /dev/null +++ b/new_file.txt @@ -0,0 +1 @@ +new_file_hello