From be836735d6bb183717018ef696f023f68ad32c8e Mon Sep 17 00:00:00 2001 From: kimwongil Date: Thu, 16 Oct 2025 11:54:32 +0900 Subject: [PATCH 1/6] hello --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index 42a89d3..b6fc4c6 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -qwqwq +hello \ No newline at end of file From 18b8c0eaaf234c59225de3ce4f293869c8e15e8f Mon Sep 17 00:00:00 2001 From: kimwongil Date: Thu, 16 Oct 2025 11:55:19 +0900 Subject: [PATCH 2/6] main_hi --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index b6fc4c6..368cfb2 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -hello \ No newline at end of file +main_hello \ No newline at end of file From eb9c7b4a58b111de3e207f7419bfd27262cc9cc5 Mon Sep 17 00:00:00 2001 From: kimwongil Date: Thu, 16 Oct 2025 11:57:17 +0900 Subject: [PATCH 3/6] resolve conflict --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index 368cfb2..b6fc4c6 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -main_hello \ No newline at end of file +hello \ No newline at end of file From 3d58c4b375173d2baf9919dc815f750527a0cac6 Mon Sep 17 00:00:00 2001 From: kimwongil Date: Thu, 16 Oct 2025 12:01:40 +0900 Subject: [PATCH 4/6] hello --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index 42a89d3..b6fc4c6 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -qwqwq +hello \ No newline at end of file From 61595cef2c2fc6948f1cdecca8b395533613d663 Mon Sep 17 00:00:00 2001 From: kimwongil Date: Thu, 16 Oct 2025 12:02:28 +0900 Subject: [PATCH 5/6] main_hi --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index b6fc4c6..368cfb2 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -hello \ No newline at end of file +main_hello \ No newline at end of file From 570b3916c3ded8c3194b00a3645351055b84b521 Mon Sep 17 00:00:00 2001 From: whale99219-source Date: Thu, 16 Oct 2025 12:06:57 +0900 Subject: [PATCH 6/6] Add new file 'new_file_hello' --- aid_github_practice | 1 + 1 file changed, 1 insertion(+) create mode 100644 aid_github_practice diff --git a/aid_github_practice b/aid_github_practice new file mode 100644 index 0000000..44669ee --- /dev/null +++ b/aid_github_practice @@ -0,0 +1 @@ +new_file_hello