From fcdeaffa902cf238477e39cede778ccf48a1017b Mon Sep 17 00:00:00 2001 From: knks Date: Fri, 10 Jul 2026 01:46:11 +0900 Subject: [PATCH 01/16] add newfiie --- 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..99c7b7d92 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +newfile作成 \ No newline at end of file From d8bc218561721c67fc1111c8ad985b06df42f90d Mon Sep 17 00:00:00 2001 From: knks Date: Fri, 10 Jul 2026 02:00:30 +0900 Subject: [PATCH 02/16] change name --- newfile.txt => namechanged.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename newfile.txt => namechanged.txt (100%) diff --git a/newfile.txt b/namechanged.txt similarity index 100% rename from newfile.txt rename to namechanged.txt From 1ea1775c92f5aa36600f29a71394e96b21a2db0d Mon Sep 17 00:00:00 2001 From: knks Date: Fri, 10 Jul 2026 02:03:32 +0900 Subject: [PATCH 03/16] change name again --- README.md | 1 + namechanged.txt => namechanged2.txt | 0 2 files changed, 1 insertion(+) rename namechanged.txt => namechanged2.txt (100%) diff --git a/README.md b/README.md index 9e7d03700..e05b801e5 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． +ローカルリポで変更 \ No newline at end of file diff --git a/namechanged.txt b/namechanged2.txt similarity index 100% rename from namechanged.txt rename to namechanged2.txt From f17a3759fe90dc7adb6f150331d5018486e9704a Mon Sep 17 00:00:00 2001 From: knks Date: Fri, 10 Jul 2026 02:10:57 +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 0dcbb07387808f3563fca6cc25da3afedb636340 Mon Sep 17 00:00:00 2001 From: knks Date: Fri, 10 Jul 2026 02:11:56 +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 8b6c05e78739b44dd0f9740f88924a4959f351a9 Mon Sep 17 00:00:00 2001 From: knks Date: Fri, 10 Jul 2026 02:13:14 +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 98f4d88ca6b923225a73fbb125b20321212ea99e Mon Sep 17 00:00:00 2001 From: knks Date: Fri, 10 Jul 2026 02:27:17 +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 edb57733d2032eb11882704ebac1b507ac724707 Mon Sep 17 00:00:00 2001 From: knks Date: Fri, 10 Jul 2026 20:54:38 +0900 Subject: [PATCH 08/16] update readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e05b801e5..d53152b7e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 \ No newline at end of file +ローカルリポで変更 +new-featureブランチで変更 \ No newline at end of file From 30d2fbe53fbd8855017ae5b58ab038e9baf6860e Mon Sep 17 00:00:00 2001 From: knks Date: Fri, 10 Jul 2026 21:08:31 +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 d53152b7e..a0d9e827f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -new-featureブランチで変更 \ No newline at end of file +no-fast-forwardランチで変更 \ No newline at end of file From 36e5b27aca00fadaca4617c626f76c23907f449b Mon Sep 17 00:00:00 2001 From: knks Date: Fri, 10 Jul 2026 21:11:42 +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..6704adb7e --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created new file! \ No newline at end of file From 244f6891c979e2c729c3dff63c09d4aa3874c295 Mon Sep 17 00:00:00 2001 From: knks Date: Fri, 10 Jul 2026 21:37:02 +0900 Subject: [PATCH 11/16] update readme on conflict branch for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a0d9e827f..e26abfb5c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forwardランチで変更 \ No newline at end of file +conflictブランチで変更（コンフリクト発生） \ No newline at end of file From 687ff66f5efc0ea1780fa686632119374b59d89c Mon Sep 17 00:00:00 2001 From: knks Date: Fri, 10 Jul 2026 21:39:59 +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 a0d9e827f..99b4dead9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forwardランチで変更 \ No newline at end of file +mainブランチで変更（コンフリクト発生） \ No newline at end of file From 7c535fedb52bf62148d6ccc0b89a89718041d7ab Mon Sep 17 00:00:00 2001 From: knks <87610950+knks@users.noreply.github.com> Date: Fri, 10 Jul 2026 21:58:53 +0900 Subject: [PATCH 13/16] update readme on github --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e26abfb5c..c2315b5bf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで変更（コンフリクト発生） \ No newline at end of file +Github上で更新 From 96f0cd193008b6bc6dd8e36662a0a8f614321cdb Mon Sep 17 00:00:00 2001 From: knks <87610950+knks@users.noreply.github.com> Date: Fri, 10 Jul 2026 22:09:15 +0900 Subject: [PATCH 14/16] 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 c2315b5bf..95d6cbad4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -Github上で更新 +Github上で更新2回目 From 40cb236e7184f6e00be53c6c94b64b36d677c2d4 Mon Sep 17 00:00:00 2001 From: knks Date: Fri, 10 Jul 2026 22:11:44 +0900 Subject: [PATCH 15/16] update readme on conflict-remote for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c2315b5bf..275e72b7e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -Github上で更新 +conflict-remote上で更新（コンフリクト発生） From 360493499b71eaf0db9958f52ef97469d9a7ffe6 Mon Sep 17 00:00:00 2001 From: knks Date: Fri, 10 Jul 2026 22:44:19 +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 275e72b7e..41714aff4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -conflict-remote上で更新（コンフリクト発生） +自分のリポジトリで更新 \ No newline at end of file