From 7c67730e4d836b9ddd8c16bafa95d03fd7765935 Mon Sep 17 00:00:00 2001 From: asatetsu Date: Thu, 15 Jan 2026 15:03:07 +0900 Subject: [PATCH 01/16] 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..4d884d787 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +create newfile \ No newline at end of file From 8d126a866708beb04ce4ece9d42343e5050ef61e Mon Sep 17 00:00:00 2001 From: asatetsu Date: Thu, 15 Jan 2026 15:23:34 +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 5090ff10ccfcadce17f5995398b4e2c5faaf0224 Mon Sep 17 00:00:00 2001 From: asatetsu Date: Thu, 15 Jan 2026 15:26:27 +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 6c9758d3d9a9306eab3005c95928d8a3280b6af3 Mon Sep 17 00:00:00 2001 From: asatetsu Date: Mon, 19 Jan 2026 15:43:27 +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 64e56e68f31d3d35f276ccb42ca53c367c5affb4 Mon Sep 17 00:00:00 2001 From: asatetsu Date: Mon, 19 Jan 2026 15:44:09 +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 85023d5bcd1c9b42d8beb0c89173f54f48a8cddc Mon Sep 17 00:00:00 2001 From: asatetsu Date: Mon, 19 Jan 2026 15:45:09 +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 aadfbdcd8ee30c585d81882fbfe3def77fa9eb7c Mon Sep 17 00:00:00 2001 From: asatetsu Date: Mon, 19 Jan 2026 16:34:45 +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 b47df8246a6d7616b744f8655ed357b94afaa20b Mon Sep 17 00:00:00 2001 From: asatetsu Date: Mon, 19 Jan 2026 17:10:32 +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..bb9747491 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 e80c1a53f0b6c5b6605a810a5931b07edcb8a322 Mon Sep 17 00:00:00 2001 From: asatetsu Date: Wed, 21 Jan 2026 13:45:28 +0900 Subject: [PATCH 09/16] update readme for automatic merge --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index bb9747491..17cd2e400 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更　　 -new-featureブランチで変更 \ No newline at end of file +new-featureブランチで変更 +no-fast-forward で変更 \ No newline at end of file From 0b7d7dfdc8bf8b067ef10d7d55c3475f50666649 Mon Sep 17 00:00:00 2001 From: asatetsu Date: Wed, 21 Jan 2026 13:47:38 +0900 Subject: [PATCH 10/16] add newfile.txt --- 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..3a63a982e --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created new file!! \ No newline at end of file From 8650c48f0d3b09dede307c830937d6209b35a08c Mon Sep 17 00:00:00 2001 From: asatetsu Date: Wed, 21 Jan 2026 16:10:28 +0900 Subject: [PATCH 11/16] update readme on conflict branch for conflict --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 17cd2e400..bc6cc8185 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更　　 -new-featureブランチで変更 -no-fast-forward で変更 \ No newline at end of file +conflictブランチで変更（コンフリクト発生） \ No newline at end of file From cdc58e02e18ca2e9006e203a930304463f1695d9 Mon Sep 17 00:00:00 2001 From: asatetsu Date: Wed, 21 Jan 2026 16:12:39 +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 17cd2e400..ca8a61a10 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更　　 new-featureブランチで変更 -no-fast-forward で変更 \ No newline at end of file +mainブランチで変更(コンフリクト発生) \ No newline at end of file From 9ebbe727bfed327f19aa90854e323d1905222c94 Mon Sep 17 00:00:00 2001 From: Tetsuo Asada Date: Wed, 21 Jan 2026 16:26:19 +0900 Subject: [PATCH 13/16] Update README to reflect changes on GitHub --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c5022fd3b..ab36c8382 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更　　 -conflictブランチで変更（コンフリクト発生） +github上で更新 From 77effe4a7d9fd9a03e66e530d6f64e77982ea9e9 Mon Sep 17 00:00:00 2001 From: Tetsuo Asada Date: Wed, 21 Jan 2026 16:35:00 +0900 Subject: [PATCH 14/16] Update README for second GitHub update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ab36c8382..01afee548 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更　　 -github上で更新 +github上で更新(２回目） From d6455e2a333f540fc9060000ca4391bdf5366312 Mon Sep 17 00:00:00 2001 From: asatetsu Date: Wed, 21 Jan 2026 16:36:28 +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 ab36c8382..90c4c8ba0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更　　 -github上で更新 +conflict-remote上で更新(コンフリクト発生) From 126bc77e23d9606c95e1ad8b7d18932d47858708 Mon Sep 17 00:00:00 2001 From: asatetsu Date: Sun, 25 Jan 2026 14:52:43 +0900 Subject: [PATCH 16/16] update readme ato my repo --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 90c4c8ba0..41714aff4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更　　 -conflict-remote上で更新(コンフリクト発生) +自分のリポジトリで更新 \ No newline at end of file