From 241701b55e7f68936223297ee8616d0e97ac09c8 Mon Sep 17 00:00:00 2001 From: Rukkthon Date: Sun, 7 Jun 2026 09:58:01 +0900 Subject: [PATCH 01/17] add newfile --- 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 6b7abc548727321f6c5881931b870ab537697a76 Mon Sep 17 00:00:00 2001 From: Rukkthon Date: Sun, 7 Jun 2026 10:26:50 +0900 Subject: [PATCH 02/17] 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 0d9c6a3cfb26e563a15bee54c3552456eb462e2b Mon Sep 17 00:00:00 2001 From: Rukkthon Date: Sun, 7 Jun 2026 10:30:12 +0900 Subject: [PATCH 03/17] change name again --- namechanged.txt => namechanged2.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename namechanged.txt => namechanged2.txt (100%) diff --git a/namechanged.txt b/namechanged2.txt similarity index 100% rename from namechanged.txt rename to namechanged2.txt From 612f30e69dc09079d8b8f0781555fe719eda0f88 Mon Sep 17 00:00:00 2001 From: Rukkthon Date: Sun, 7 Jun 2026 10:37:25 +0900 Subject: [PATCH 04/17] 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 835228c9b7e9681e232b2d0704fc5844756211aa Mon Sep 17 00:00:00 2001 From: Rukkthon Date: Sun, 7 Jun 2026 10:38:30 +0900 Subject: [PATCH 05/17] 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 0cf1a3903cfa235efebc0bcdda4d4b9397fbf2e1 Mon Sep 17 00:00:00 2001 From: Rukkthon Date: Sun, 7 Jun 2026 10:49:16 +0900 Subject: [PATCH 06/17] newfile --- 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 e1bb4d7ff15769ac6864b9e2470cf0050f1672c8 Mon Sep 17 00:00:00 2001 From: Rukkthon Date: Sun, 7 Jun 2026 12:10:13 +0900 Subject: [PATCH 07/17] 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 9c64a860659d468c7c87e06400bc51e9a51b571d Mon Sep 17 00:00:00 2001 From: Rukkthon Date: Sun, 7 Jun 2026 12:36:45 +0900 Subject: [PATCH 08/17] update readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9e7d03700..75ea51dd0 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． +ローカルリポで変更 +new-featureブランチで変更 \ No newline at end of file From 2ef585e908bf82e3d90066ff42527961df565862 Mon Sep 17 00:00:00 2001 From: Rukkthon Date: Sun, 7 Jun 2026 12:47:16 +0900 Subject: [PATCH 09/17] update readme for automatic merge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 75ea51dd0..76afd9a52 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 979b1c8e0e38c68d0afcc1cb0b14dbfe983717e8 Mon Sep 17 00:00:00 2001 From: Rukkthon Date: Sun, 7 Jun 2026 12:49:12 +0900 Subject: [PATCH 10/17] make 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..6704adb7e --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created new file! \ No newline at end of file From b6bc3d6966f2f4073c42b8acdd9109b8b999a4ae Mon Sep 17 00:00:00 2001 From: Rukkthon Date: Sun, 7 Jun 2026 14:02:14 +0900 Subject: [PATCH 11/17] update readme for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 76afd9a52..ecfd1805c 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 a79da8f9e42d74c06adb2879f3a38a6012e51029 Mon Sep 17 00:00:00 2001 From: Rukkthon Date: Sun, 7 Jun 2026 14:04:42 +0900 Subject: [PATCH 12/17] 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 76afd9a52..29dc22671 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 3eff70307088e58067cf5246a64f61b18e80a23e Mon Sep 17 00:00:00 2001 From: Rukkthon <66195370+Rukkthon@users.noreply.github.com> Date: Sun, 7 Jun 2026 16:57:05 +0900 Subject: [PATCH 13/17] Update README.md update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ecfd1805c..a24f88a6a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで変更 \ No newline at end of file +Github上で更新 From 062d3e87378f9aeda804a51bab7fec8823cb3466 Mon Sep 17 00:00:00 2001 From: Rukkthon <66195370+Rukkthon@users.noreply.github.com> Date: Sun, 7 Jun 2026 17:16:00 +0900 Subject: [PATCH 14/17] Update README to reflect second update on GitHub --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a24f88a6a..ddfabd419 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -Github上で更新 +Github上で更新2回目 From 96ca5dd7652508ea1c5dad520b47bf1d8b4fae88 Mon Sep 17 00:00:00 2001 From: Rukkthon Date: Sun, 7 Jun 2026 17:18:43 +0900 Subject: [PATCH 15/17] update readme on conflict-remote --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a24f88a6a..78c7c4b2f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -Github上で更新 +conflict-remote上でコンフリクト発生 \ No newline at end of file From 9f0a98c231c0af7232833ba212eccdba08a4a2d3 Mon Sep 17 00:00:00 2001 From: Rukkthon <66195370+Rukkthon@users.noreply.github.com> Date: Sun, 7 Jun 2026 17:24:01 +0900 Subject: [PATCH 16/17] Update README.md content for clarity --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index ddfabd419..623acaed0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -Github上で更新2回目 From 7edb4d4b056845eba56caefcdb3ce07db25a09c8 Mon Sep 17 00:00:00 2001 From: Rukkthon Date: Sun, 7 Jun 2026 17:52:53 +0900 Subject: [PATCH 17/17] update README for mine --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 78c7c4b2f..41714aff4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -conflict-remote上でコンフリクト発生 \ No newline at end of file +自分のリポジトリで更新 \ No newline at end of file