From d4a780d0d83a0d290cb63b7d5847057d2353296c Mon Sep 17 00:00:00 2001 From: Ash815 Date: Tue, 9 Dec 2025 08:01:32 +0900 Subject: [PATCH 01/16] add 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..99c7b7d92 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +newfile作成 \ No newline at end of file From 283afc7ad6aac4af9cc19aedc1d5c09c9cefcf32 Mon Sep 17 00:00:00 2001 From: Ash815 Date: Tue, 9 Dec 2025 08:16:05 +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 1a4a662a8df907aed3c8f2ab3072872b933ee4e1 Mon Sep 17 00:00:00 2001 From: Ash815 Date: Tue, 9 Dec 2025 08:19:02 +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 ade266a1e2d20225139374ff1cdd1c7a1fcc08e7 Mon Sep 17 00:00:00 2001 From: Ash815 Date: Tue, 9 Dec 2025 08:26:49 +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 1e8566141dc202f2e336ae14adbb61a689d26be9 Mon Sep 17 00:00:00 2001 From: Ash815 Date: Tue, 9 Dec 2025 08:28:02 +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 b81311ee24b0a5f3b1977a8c9ab0b286f01db719 Mon Sep 17 00:00:00 2001 From: Ash815 Date: Tue, 9 Dec 2025 08:30:23 +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 d84791a6f79c5103fbde05a2e632f7e0ff14099c Mon Sep 17 00:00:00 2001 From: Ash815 Date: Wed, 10 Dec 2025 08:21:22 +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 04cf7025ddc55adb134c95bdc90fb188c8444154 Mon Sep 17 00:00:00 2001 From: Ash815 Date: Fri, 12 Dec 2025 08:08:00 +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..75ea51dd0 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 c642fe8b02fed8b3bcc7c5ba224fbfcd0385f355 Mon Sep 17 00:00:00 2001 From: Ash815 Date: Fri, 12 Dec 2025 08:19:36 +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 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 4c34c327d09f5cf69d36acf3ca2fb951942a99b4 Mon Sep 17 00:00:00 2001 From: Ash815 Date: Fri, 12 Dec 2025 08:22:03 +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 c3758bbb7e13f0ad4daa618c882e1d194b70349b Mon Sep 17 00:00:00 2001 From: Ash815 Date: Mon, 15 Dec 2025 08:15:47 +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 76afd9a52..26f83dbc9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forwardブランチで変更 \ No newline at end of file +conflictブランチで変更(conflict発生) \ No newline at end of file From fcfdfa2a4578725459966e5dd8149abdd3c0b595 Mon Sep 17 00:00:00 2001 From: Ash815 Date: Mon, 15 Dec 2025 08:18:22 +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 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 643d7a2d3c8aab5bd9cccfd94627b5b79158e32a Mon Sep 17 00:00:00 2001 From: Ash815 <34545771+Ash815@users.noreply.github.com> Date: Tue, 16 Dec 2025 07:50:48 +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 26f83dbc9..74b0896c9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで変更(conflict発生) \ No newline at end of file +GitHub上で更新 From d94f9b7bf83f1c2c8dbaa69e573e55a9225dd35d Mon Sep 17 00:00:00 2001 From: Ash815 <34545771+Ash815@users.noreply.github.com> Date: Tue, 16 Dec 2025 08:14:30 +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 74b0896c9..cd47895dd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -GitHub上で更新 +GitHub上で更新2回目 From f41219d3cf29380c37cfa4d1495bdbb446e9f906 Mon Sep 17 00:00:00 2001 From: Ash815 Date: Tue, 16 Dec 2025 08:16:43 +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 74b0896c9..828d20253 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -GitHub上で更新 +conflict-remote上で更新 \ No newline at end of file From 9b6341b4b0747b9af97a1b4d5214caa669429bab Mon Sep 17 00:00:00 2001 From: Ash815 Date: Wed, 17 Dec 2025 07:57:38 +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 828d20253..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