From 5449cbe3031c37d0b9b13cc4a2e4aca63a8ccd98 Mon Sep 17 00:00:00 2001 From: NH50042 Date: Mon, 27 Jul 2026 17:03:31 +0900 Subject: [PATCH 1/9] update readme for automatic merge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9e7d03700..ef7fa6d89 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． +no-fast-forwardで変更 \ No newline at end of file From 8fde7f9fb6613201e8c03050021ebcfd567ac5d5 Mon Sep 17 00:00:00 2001 From: NH50042 Date: Mon, 27 Jul 2026 17:05:39 +0900 Subject: [PATCH 2/9] 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 e0a547d9afdadf11a1787178ec89ecee0fd765df Mon Sep 17 00:00:00 2001 From: NH50042 Date: Mon, 27 Jul 2026 17:13:46 +0900 Subject: [PATCH 3/9] update readme on conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ef7fa6d89..6ce2a1adb 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -no-fast-forwardで変更 \ No newline at end of file +conflictで変更 \ No newline at end of file From cb3c20d81b1a42cf89a95f0b6467342bb5d6aee4 Mon Sep 17 00:00:00 2001 From: NH50042 Date: Mon, 27 Jul 2026 17:15:16 +0900 Subject: [PATCH 4/9] update readme on main --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ef7fa6d89..080a1d498 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -no-fast-forwardで変更 \ No newline at end of file +mainで変更 \ No newline at end of file From 3bf16bd83432556b7f3fedb025adea7b87c4d9a6 Mon Sep 17 00:00:00 2001 From: NH50042 Date: Tue, 28 Jul 2026 15:21:36 +0900 Subject: [PATCH 5/9] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ce2a1adb..507f6eaa7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -conflictで変更 \ No newline at end of file +conflictで変更 +GitHub上で更新 From a9cb73d7b4cc06e6dddb56e61987f3f5160228e1 Mon Sep 17 00:00:00 2001 From: NH50042 Date: Tue, 28 Jul 2026 15:34:49 +0900 Subject: [PATCH 6/9] Update README.md --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 507f6eaa7..1b6e60a87 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # git-practice -このリポジトリはGit動画講座用です． -conflictで変更 -GitHub上で更新 +このリポジトリはGit動画講座用です． +conflictで変更 +GitHub上で更新 +うぇーい From 21d3d202acb113f0fb97314b7ebe611eef674c40 Mon Sep 17 00:00:00 2001 From: NH50042 Date: Tue, 28 Jul 2026 15:35:05 +0900 Subject: [PATCH 7/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1b6e60a87..f04574a43 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # git-practice -このリポジトリはGit動画講座用です． +このリポジトリはGit動画講座用です． conflictで変更 GitHub上で更新 うぇーい From 983d4292a0f8a9b7a63eae1c643c56d1d69511b7 Mon Sep 17 00:00:00 2001 From: NH50042 Date: Tue, 28 Jul 2026 15:36:21 +0900 Subject: [PATCH 8/9] for conflict --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 507f6eaa7..327002fea 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,4 @@ このリポジトリはGit動画講座用です． conflictで変更 GitHub上で更新 +conflict-remote上で更新 \ No newline at end of file From 25cc648116fe1db51d6094c4e75c3e1de24eafb8 Mon Sep 17 00:00:00 2001 From: NH50042 Date: Wed, 29 Jul 2026 10:42:38 +0900 Subject: [PATCH 9/9] update readme at my repo --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index f04574a43..ef7bd3c93 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -conflictで変更 -GitHub上で更新 -うぇーい +自分のリポジトリで更新 \ No newline at end of file