From fcff4e5181c1a97a15ffe770b2d718100211b629 Mon Sep 17 00:00:00 2001 From: happyfieldpioneer Date: Sun, 25 May 2025 10:54:25 +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..3b85044ed --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +newfile 作成 \ No newline at end of file From 862c4ea45ff2b876ef6dbfe1658ae73dc0effcc6 Mon Sep 17 00:00:00 2001 From: happyfieldpioneer Date: Sun, 25 May 2025 11:31:07 +0900 Subject: [PATCH 02/16] chage 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 aff1bffd13d8b8e44a1d3e24ad0e02fc8ddbe864 Mon Sep 17 00:00:00 2001 From: happyfieldpioneer Date: Sun, 25 May 2025 11:37:01 +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 e002a99fb548a20022c5254649490c2305f1f6e3 Mon Sep 17 00:00:00 2001 From: happyfieldpioneer Date: Sun, 25 May 2025 11:43:18 +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 5d3b7c1b4cd4d41a7f85f16f542c35b6583f1a75 Mon Sep 17 00:00:00 2001 From: happyfieldpioneer Date: Sun, 25 May 2025 11:44:49 +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 7795cd2e9092de6a0df15c147c977139a43cc4eb Mon Sep 17 00:00:00 2001 From: happyfieldpioneer Date: Sun, 25 May 2025 11:46:19 +0900 Subject: [PATCH 06/16] commit message --- 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 4aad0f234063c60049d0f10a1444765c7ccfa786 Mon Sep 17 00:00:00 2001 From: happyfieldpioneer Date: Sun, 25 May 2025 12:00:38 +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 f26a09ce36d9a9bee226b360c2ff7571acc5e5b6 Mon Sep 17 00:00:00 2001 From: happyfieldpioneer Date: Sun, 25 May 2025 12:36:23 +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 9b9975c27802e45404ff2513973d0a2d8385497a Mon Sep 17 00:00:00 2001 From: happyfieldpioneer Date: Sun, 25 May 2025 12:47:45 +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 bb9747491..3b3ee01e2 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 a7301dedf89ba99fabd6278cfd0a8a66c80158a7 Mon Sep 17 00:00:00 2001 From: happyfieldpioneer Date: Sun, 25 May 2025 12:50:34 +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 ce0a2bf0be51ad70b7592dd0c8affc2a0ff4d7ed Mon Sep 17 00:00:00 2001 From: happyfieldpioneer Date: Sun, 25 May 2025 12:59:19 +0900 Subject: [PATCH 11/16] update read me on conflict branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3b3ee01e2..723a44203 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 f5bc92f0fa9c6f62b159a66f7a769977f048a30d Mon Sep 17 00:00:00 2001 From: happyfieldpioneer Date: Sun, 25 May 2025 13:01:08 +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 3b3ee01e2..fd19ecbb9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更　　 -no-fast-forwardブランチで変更 \ No newline at end of file +mainブランチで変更(conflict発生) \ No newline at end of file From 06bf0d47dc16eafaf35d3f78c7d403fe8a8f4753 Mon Sep 17 00:00:00 2001 From: hfp-kaito <164597438+hfp-kaito@users.noreply.github.com> Date: Sun, 25 May 2025 13:37:42 +0900 Subject: [PATCH 13/16] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 95e52c735..ab36c8382 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更　　 -conflictブランチで変更(conflict発生) +github上で更新 From b572b073d388d57944666b89b5b2563d41bd381c Mon Sep 17 00:00:00 2001 From: hfp-kaito <164597438+hfp-kaito@users.noreply.github.com> Date: Sun, 25 May 2025 13:50:15 +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 ab36c8382..83245d1cb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更　　 -github上で更新 +github上で更新2回目 From 93028ff36bcb27c4870b0675a0d55da659e1610b Mon Sep 17 00:00:00 2001 From: happyfieldpioneer Date: Sun, 25 May 2025 13:52:31 +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 774681f5c039047e749c23145b67cf39e5594aa9 Mon Sep 17 00:00:00 2001 From: happyfieldpioneer Date: Sun, 25 May 2025 14:15:26 +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 65dc48387..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