From ffa7e7f67b987ff1bdfae63cf4003426b97c8bea Mon Sep 17 00:00:00 2001 From: shin_myaku Date: Sat, 7 Feb 2026 22:00:16 +0900 Subject: [PATCH 01/16] 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 98a13699ebae10b3956fb3e8bd3d086040f8075c Mon Sep 17 00:00:00 2001 From: shin_myaku Date: Sat, 7 Feb 2026 22:26:36 +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 e55293d7a2133fbf2032fc4ceb482ee3765bde34 Mon Sep 17 00:00:00 2001 From: shin_myaku Date: Sat, 7 Feb 2026 22:31:28 +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 42de0732b9cf702db3b8e3f0e60cdad1c0525e11 Mon Sep 17 00:00:00 2001 From: shin_myaku Date: Sat, 7 Feb 2026 22:47:43 +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 6d65e55d303a97ded1f8b227510d76bb6f0aaa7e Mon Sep 17 00:00:00 2001 From: shin_myaku Date: Sat, 7 Feb 2026 22:49: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 4971511b144b892e0d9161a3f4531f6427bfc767 Mon Sep 17 00:00:00 2001 From: shin_myaku Date: Sat, 7 Feb 2026 22:51:48 +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 662b039757e5a5ed5b0f4fa08e555e64b1a21976 Mon Sep 17 00:00:00 2001 From: shin_myaku Date: Sat, 7 Feb 2026 23:22:10 +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 efd6b3f1f0e24a9433e8db99816686fcdaa306d0 Mon Sep 17 00:00:00 2001 From: shin_myaku Date: Sun, 8 Feb 2026 11:27:55 +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 5b05824f388e74743981c27b27a66f8df5c9034d Mon Sep 17 00:00:00 2001 From: shin_myaku Date: Sun, 8 Feb 2026 14:16:01 +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..a7913c845 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 fede5d7a26ae965b7776b64b06354b393386e852 Mon Sep 17 00:00:00 2001 From: shin_myaku Date: Sun, 8 Feb 2026 14:19:46 +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..cea55e870 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created new file \ No newline at end of file From 78f4b19b764c69ee864bd0738c794ade9294b66e Mon Sep 17 00:00:00 2001 From: shin_myaku Date: Sun, 8 Feb 2026 14:35:54 +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 a7913c845..b157c4f5d 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 0a41587caef62eb19c57d2c6f77e3aa57cb600f3 Mon Sep 17 00:00:00 2001 From: shin_myaku Date: Sun, 8 Feb 2026 14:38:43 +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 a7913c845..22cbfd97b 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 02df948de5be8f8b2a54cba85c08c1eff48777da Mon Sep 17 00:00:00 2001 From: shin-myaku Date: Sun, 8 Feb 2026 17:32:17 +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 2f982c45a..ebb30868f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで変更 +GitHub上で更新 From e47562a1babd4124ad18580f5787063ca3feaa67 Mon Sep 17 00:00:00 2001 From: shin-myaku Date: Sun, 8 Feb 2026 17:46:34 +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 ebb30868f..a968afee4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -GitHub上で更新 +GitHub上で更新2回目 From 0107059ff3b6604e3c1055f288ac403fc96921c1 Mon Sep 17 00:00:00 2001 From: shin_myaku Date: Sun, 8 Feb 2026 17:48:33 +0900 Subject: [PATCH 15/16] update readme on conflict-remote --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ebb30868f..598aa79e7 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -GitHub上で更新 +conflict-remote上で更新 From ca67477d3d35711a17ef09d3c5c062b23406763e Mon Sep 17 00:00:00 2001 From: shin_myaku Date: Sun, 8 Feb 2026 19:24:07 +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 3265bc207..21953435b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -conflict-remote上で更新 +自分のリポジトリで更新