From d2eff0dbed509336a5c729545245e5b013d4b9fc Mon Sep 17 00:00:00 2001 From: masae105 Date: Mon, 20 Jul 2026 03:29:09 +0900 Subject: [PATCH 01/13] first commit --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000..c7f60767a --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# Git Practice From ccbc1821831edfc9c028445c75f4d1abe6d4d603 Mon Sep 17 00:00:00 2001 From: masae105 Date: Mon, 20 Jul 2026 03:35:33 +0900 Subject: [PATCH 02/13] update README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c7f60767a..087be5fcc 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ # Git Practice +Gitの勉強中です。 \ No newline at end of file From 74ce3f0b8893996278fd22659c2acc3804e7a6fe Mon Sep 17 00:00:00 2001 From: masae105 Date: Mon, 20 Jul 2026 04:45:48 +0900 Subject: [PATCH 03/13] add namechange file --- namechange.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 namechange.txt diff --git a/namechange.txt b/namechange.txt new file mode 100644 index 000000000..e69de29bb From 62de1ea3b2999b07254f25396a9a9c76d0eb20a8 Mon Sep 17 00:00:00 2001 From: masae105 Date: Mon, 20 Jul 2026 04:50:41 +0900 Subject: [PATCH 04/13] change name agein --- namechange.txt => namechanged.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename namechange.txt => namechanged.txt (100%) diff --git a/namechange.txt b/namechanged.txt similarity index 100% rename from namechange.txt rename to namechanged.txt From 39cba8962a70aa4ea7afa7704ee0b8985961dcc7 Mon Sep 17 00:00:00 2001 From: masae105 Date: Mon, 20 Jul 2026 05:14:49 +0900 Subject: [PATCH 05/13] delete 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 b084b538d4528fce60c40b84e4c9ad9620662a7e Mon Sep 17 00:00:00 2001 From: masae105 Date: Mon, 20 Jul 2026 21:49:45 +0900 Subject: [PATCH 06/13] 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 81ba2997335a6aecc8727a9604a7613bbdc4f0ef Mon Sep 17 00:00:00 2001 From: masae105 Date: Mon, 20 Jul 2026 23:32:30 +0900 Subject: [PATCH 07/13] 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 ca6fdb10c9ba9e50f8709adaa017e584a4c7a742 Mon Sep 17 00:00:00 2001 From: masae105 Date: Mon, 20 Jul 2026 23:59:14 +0900 Subject: [PATCH 08/13] 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 152e3385b716785161c64fbc566b971e0ce51720 Mon Sep 17 00:00:00 2001 From: masae105 Date: Tue, 21 Jul 2026 00:08:07 +0900 Subject: [PATCH 09/13] 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..3a63a982e --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created new file!! \ No newline at end of file From 9fcd91270f02b3d37f4db09b50ead92d7d55b661 Mon Sep 17 00:00:00 2001 From: masae105 Date: Tue, 21 Jul 2026 00:35:50 +0900 Subject: [PATCH 10/13] 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 76afd9a52..d320eac15 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 15fa916254ac49edf4d8ab703b8e2283832a9096 Mon Sep 17 00:00:00 2001 From: masae105 Date: Tue, 21 Jul 2026 00:41:15 +0900 Subject: [PATCH 11/13] .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..9959792f7 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 f08b7f7be29bc2c1d56b8dfac21ee221dc0fa3e9 Mon Sep 17 00:00:00 2001 From: masae105 Date: Wed, 22 Jul 2026 03:08:32 +0900 Subject: [PATCH 12/13] Update README on github --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c23a66c24..a24f88a6a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで変更(コンフリクト発生) +Github上で更新 From 11caf6e92947cfb2c853de39a9cf9057a8458d4b Mon Sep 17 00:00:00 2001 From: masae105 Date: Thu, 23 Jul 2026 03:31:53 +0900 Subject: [PATCH 13/13] updete readme at my repo --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index a24f88a6a..e62b1a54c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -Github上で更新 +自分のリポジトリで更新