From 68977cf9b7608a1aaf412981e17dbb0be0cfecb7 Mon Sep 17 00:00:00 2001 From: yamaguch-i Date: Fri, 12 Sep 2025 12:09:56 +0900 Subject: [PATCH 01/16] add newfile --- newfile.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 000000000..e69de29bb From 12c931d635801525b53f7af6bc56bd28dff96177 Mon Sep 17 00:00:00 2001 From: yamaguch-i Date: Fri, 12 Sep 2025 20:19:49 +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 2d88a06746fee89f2cc4e76a09fc4b935e50e45a Mon Sep 17 00:00:00 2001 From: yamaguch-i Date: Fri, 12 Sep 2025 20:25: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..623acaed0 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． +ローカルリポで変更 diff --git a/namechanged.txt b/namechanged2.txt similarity index 100% rename from namechanged.txt rename to namechanged2.txt From ea4fefa27f5b91e77e45fba629ea85a778670031 Mon Sep 17 00:00:00 2001 From: yamaguch-i Date: Fri, 12 Sep 2025 21:14:02 +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 9acf7551da90d3d7b0504841e85cf5144b1275e1 Mon Sep 17 00:00:00 2001 From: yamaguch-i Date: Fri, 12 Sep 2025 21:15:53 +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 b27b3e2bb1cb4bf1f8a8cfa9a0e537c75a2c2b76 Mon Sep 17 00:00:00 2001 From: yamaguch-i Date: Fri, 12 Sep 2025 21:19:03 +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 acfe0b11129e5591e13f949af205ac45dda7c6f0 Mon Sep 17 00:00:00 2001 From: yamaguch-i Date: Sat, 13 Sep 2025 16:48:31 +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 a755e1898c72295826edfebd3ed51aa7c2617707 Mon Sep 17 00:00:00 2001 From: yamaguch-i Date: Sat, 13 Sep 2025 20:11:07 +0900 Subject: [PATCH 08/16] update README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 623acaed0..75ea51dd0 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 +new-featureブランチで変更 \ No newline at end of file From 551810826a1770e17b410539eb1c6602b7dfbc5c Mon Sep 17 00:00:00 2001 From: yamaguch-i Date: Sat, 13 Sep 2025 20:37:46 +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 65ac2489795baebd11d1c78a79715766743fd860 Mon Sep 17 00:00:00 2001 From: yamaguch-i Date: Sat, 13 Sep 2025 20:44:47 +0900 Subject: [PATCH 10/16] make newfile 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..8eea11d7c --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created new file！ \ No newline at end of file From cafc5e9c92bcd2a40e9d64fdaf5189035eb1b758 Mon Sep 17 00:00:00 2001 From: yamaguch-i Date: Sun, 14 Sep 2025 10:35:18 +0900 Subject: [PATCH 11/16] update readme for confrict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 76afd9a52..2e68681b4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forwardブランチで変更 \ No newline at end of file +confrictブランチで変更(コンフリクト発生) \ No newline at end of file From d4d50e7fad7ee823cec57a1ee8e15c8b87b693ea Mon Sep 17 00:00:00 2001 From: yamaguch-i Date: Sun, 14 Sep 2025 10:41:59 +0900 Subject: [PATCH 12/16] update readme on main for confrict --- 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 0a593561ef9f3f091f1531c7312cf807476ae27e Mon Sep 17 00:00:00 2001 From: yamaguch-i <155544636+yamaguch-i@users.noreply.github.com> Date: Sun, 14 Sep 2025 12:31:53 +0900 Subject: [PATCH 13/16] Update README.md on GitHub --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b2cb6557a..74b0896c9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -confrictブランチで変更(コンフリクト発生) +GitHub上で更新 From 7391bba65a029dfda848f90c6495a3bda54f67e9 Mon Sep 17 00:00:00 2001 From: yamaguch-i <155544636+yamaguch-i@users.noreply.github.com> Date: Sun, 14 Sep 2025 12:54:29 +0900 Subject: [PATCH 14/16] Update README.md on GitHub for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 74b0896c9..3294504e5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -GitHub上で更新 +GitHub上で更新(編集) From cafebe3d0975053821f934b67c1c0119c0c026ad Mon Sep 17 00:00:00 2001 From: yamaguch-i Date: Sun, 14 Sep 2025 12:58:00 +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 74b0896c9..27eca28bb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -GitHub上で更新 +conflict-remote上で更新 From 3cbe4175fc20d568f9bdce79eb8359f1ac8ce2f4 Mon Sep 17 00:00:00 2001 From: yamaguch-i Date: Sun, 14 Sep 2025 13:50:12 +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 27eca28bb..41714aff4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -conflict-remote上で更新 +自分のリポジトリで更新 \ No newline at end of file