From 31d63a474262c1604b919eacbc78639d42ec6346 Mon Sep 17 00:00:00 2001 From: Daichi Suzuki Date: Mon, 9 Mar 2026 19:11:28 +0900 Subject: [PATCH 01/16] add_new file --- newfile.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 000000000..aa39060d7 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +newfile From 0d84c3270bc05a850822d907880b64ea59ab65cb Mon Sep 17 00:00:00 2001 From: Daichi Suzuki Date: Mon, 9 Mar 2026 19:43:43 +0900 Subject: [PATCH 02/16] change name --- newfile.txt => namechenged.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename newfile.txt => namechenged.txt (100%) diff --git a/newfile.txt b/namechenged.txt similarity index 100% rename from newfile.txt rename to namechenged.txt From 1b2bd10763e9814e30396a6b67bc08c6aaf56e92 Mon Sep 17 00:00:00 2001 From: Daichi Suzuki Date: Mon, 9 Mar 2026 19:47:46 +0900 Subject: [PATCH 03/16] change name again --- README.md | 1 + namechenged.txt => namechenged2.txt | 0 2 files changed, 1 insertion(+) rename namechenged.txt => namechenged2.txt (100%) diff --git a/README.md b/README.md index 9e7d03700..991753bf1 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． +test change diff --git a/namechenged.txt b/namechenged2.txt similarity index 100% rename from namechenged.txt rename to namechenged2.txt From e8d14c45dbe55373f17fd925faadb4f0138acd09 Mon Sep 17 00:00:00 2001 From: Daichi Suzuki Date: Mon, 9 Mar 2026 20:33:05 +0900 Subject: [PATCH 04/16] make new file --- delete_soon.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 delete_soon.txt diff --git a/delete_soon.txt b/delete_soon.txt new file mode 100644 index 000000000..e69de29bb From 77925467404fa10ac7872a9eeb3a5918421214aa Mon Sep 17 00:00:00 2001 From: Daichi Suzuki Date: Mon, 9 Mar 2026 20:34:17 +0900 Subject: [PATCH 05/16] delete file --- delete_soon.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 delete_soon.txt diff --git a/delete_soon.txt b/delete_soon.txt deleted file mode 100644 index e69de29bb..000000000 From 56a97a55f08277d821381466fb7e945ed188f769 Mon Sep 17 00:00:00 2001 From: Daichi Suzuki Date: Mon, 9 Mar 2026 20:35:58 +0900 Subject: [PATCH 06/16] new file --- delete_soon.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 delete_soon.txt diff --git a/delete_soon.txt b/delete_soon.txt new file mode 100644 index 000000000..e69de29bb From e4578b972029db16065c2bdf5ea6ae07b52e06c2 Mon Sep 17 00:00:00 2001 From: Daichi Suzuki Date: Tue, 10 Mar 2026 07:49:35 +0900 Subject: [PATCH 07/16] add .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..f0de82f57 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +output.log \ No newline at end of file From 7bf5c7ca8993e0e7adb6af9cac9d2fba4034620f Mon Sep 17 00:00:00 2001 From: Daichi Suzuki Date: Tue, 10 Mar 2026 17:35:20 +0900 Subject: [PATCH 08/16] update readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 991753bf1..e4b24080d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． test change +new-feature branch change From d672c40491c3c2da48a0edd77a6a8e4868ae3cda Mon Sep 17 00:00:00 2001 From: Daichi Suzuki Date: Tue, 10 Mar 2026 17:52:00 +0900 Subject: [PATCH 09/16] update readme for automatic merge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e4b24080d..fc3431c01 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． test change -new-feature branch change +no-fast-forward branch change From 4f8d9ba91a2134ccc15e3d29b27211225be7bac7 Mon Sep 17 00:00:00 2001 From: Daichi Suzuki Date: Tue, 10 Mar 2026 17:55:03 +0900 Subject: [PATCH 10/16] make new file for automatic merge --- newfile.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 000000000..0ad9beb93 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created newfile From ba45e3bfff8168fa3585861b2e9d617db0cfc166 Mon Sep 17 00:00:00 2001 From: Daichi Suzuki Date: Tue, 10 Mar 2026 21:04:24 +0900 Subject: [PATCH 11/16] update readme for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fc3431c01..5e46ae357 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． test change -no-fast-forward branch change +conflict branch change From 86ad9e9032a1696493effc74ed3198e7e17b2439 Mon Sep 17 00:00:00 2001 From: Daichi Suzuki Date: Tue, 10 Mar 2026 21:06:50 +0900 Subject: [PATCH 12/16] update readme on main for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fc3431c01..a48781a2d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． test change -no-fast-forward branch change +main branch change(conflict) From f686ea9e2c34d5589988b12c23c8f2e239189233 Mon Sep 17 00:00:00 2001 From: gitdsuzuki <80626026+gitdsuzuki@users.noreply.github.com> Date: Tue, 10 Mar 2026 21:28:43 +0900 Subject: [PATCH 13/16] Update README.md update readme on github --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e46ae357..5089dd3d1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． test change -conflict branch change +Github上で更新 From 2014a50a96a090bf56dddcbcc2f7ba5a6c694912 Mon Sep 17 00:00:00 2001 From: gitdsuzuki <80626026+gitdsuzuki@users.noreply.github.com> Date: Tue, 10 Mar 2026 21:41:34 +0900 Subject: [PATCH 14/16] Update README.md update readme on github for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5089dd3d1..411a41c77 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． test change -Github上で更新 +Github上で更新2回目 From 8a7c58144964f0c87ef75adfa972ab1427b94899 Mon Sep 17 00:00:00 2001 From: Daichi Suzuki Date: Tue, 10 Mar 2026 21:47:17 +0900 Subject: [PATCH 15/16] update on conflict-remote branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5089dd3d1..b0e5e7ff5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． test change -Github上で更新 +testtesで更新(conflict) From cdac2c18253ca4b36fbbee20761a4a43c3af5941 Mon Sep 17 00:00:00 2001 From: Daichi Suzuki Date: Tue, 10 Mar 2026 22:17:17 +0900 Subject: [PATCH 16/16] update readme at my repo --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index b0e5e7ff5..c92d1c90e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -test change -testtesで更新(conflict) +jibun no repo de kousin