From b8ff6ed2bcc8d8565f751a58c21cfa5ec9582145 Mon Sep 17 00:00:00 2001 From: Yoichiro Nakayama Date: Sat, 7 Jun 2025 09:33:59 +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..49ba5e4e8 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +newfile作成 From 97689fe576b6f253bcb17264867dca5e83b64675 Mon Sep 17 00:00:00 2001 From: Yoichiro Nakayama Date: Sat, 7 Jun 2025 09:59:50 +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 be339ff5cb8bfe3cdef18dcda3402ed9e71cde30 Mon Sep 17 00:00:00 2001 From: Yoichiro Nakayama Date: Sat, 7 Jun 2025 10:07:52 +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 f0234c737ead20b4f41a60e4ad7ee53df3cb8368 Mon Sep 17 00:00:00 2001 From: Yoichiro Nakayama Date: Sat, 7 Jun 2025 11:26:26 +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 351916659a2ac3202e19b0fd9a82a8e0eb574cda Mon Sep 17 00:00:00 2001 From: Yoichiro Nakayama Date: Sat, 7 Jun 2025 11:27:42 +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 961d74d00959cc243fc7c1aaaa338d62831f2a12 Mon Sep 17 00:00:00 2001 From: Yoichiro Nakayama Date: Sat, 7 Jun 2025 15:52:02 +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 f8875bbb9e2db20dc000f48a7c09ae845571ebfe Mon Sep 17 00:00:00 2001 From: Yoichiro Nakayama Date: Sat, 7 Jun 2025 16:39:02 +0900 Subject: [PATCH 07/16] add gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..6a20943e0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +output.log +*.un~ From 5ece0fd335348d326775c45b09b5d7662adefa06 Mon Sep 17 00:00:00 2001 From: Yoichiro Nakayama Date: Sat, 7 Jun 2025 17:47:20 +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 623acaed0..e7dc1b62f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 +ローカルリポで変更 +new-featureブランチで変更 From 9a33eeb8c62881077a07e105f1df183c80131dd8 Mon Sep 17 00:00:00 2001 From: Yoichiro Nakayama Date: Sun, 8 Jun 2025 10:23:30 +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 e7dc1b62f..d2822602c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -new-featureブランチで変更 +no-fast-forwardブランチで変更 From a22414f4db028d17490528156d1e94649fd5a968 Mon Sep 17 00:00:00 2001 From: Yoichiro Nakayama Date: Sun, 8 Jun 2025 10:28:26 +0900 Subject: [PATCH 10/16] meke 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..12bcfa88a --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created new file !! From 6163781a8563b4d0d51882a0231a45bc86227d4c Mon Sep 17 00:00:00 2001 From: Yoichiro Nakayama Date: Sun, 8 Jun 2025 14:27:10 +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 d2822602c..3db1683f4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forwardブランチで変更 +conflictブランチで変更 From eea0aab49dddb8e6a8ffb5e51c3b514da25afb1b Mon Sep 17 00:00:00 2001 From: Yoichiro Nakayama Date: Sun, 8 Jun 2025 14:32:57 +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 d2822602c..179d4576b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forwardブランチで変更 +mainブランチで変更（コンフリクト発生） From 326ed4851052753a3483b2c1c6884f59cdb4f84e Mon Sep 17 00:00:00 2001 From: yoinak <126298006+yoinak@users.noreply.github.com> Date: Sun, 8 Jun 2025 17:26:09 +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 3db1683f4..f35a35574 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで変更 +GitHub上で更新 From 5a3317c900bc8d09ffad55cb9a20fda65661d972 Mon Sep 17 00:00:00 2001 From: yoinak <126298006+yoinak@users.noreply.github.com> Date: Sun, 8 Jun 2025 18:10:36 +0900 Subject: [PATCH 14/16] Update README.md on github conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f35a35574..3b1790e13 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -GitHub上で更新 +GitHub上で更新2回目 From 59e76a4c1104bd5a388c34e3651552caf8103fe7 Mon Sep 17 00:00:00 2001 From: Yoichiro Nakayama Date: Sun, 8 Jun 2025 18:13:23 +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 f35a35574..849b11151 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -GitHub上で更新 +conflict-remote上で更新(コンフリクト発生) From 9ee7a236930fd1e90fe192a8d52c64c28ad3a9f1 Mon Sep 17 00:00:00 2001 From: Yoichiro Nakayama Date: Mon, 9 Jun 2025 19:34:28 +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 849b11151..e62b1a54c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -conflict-remote上で更新(コンフリクト発生) +自分のリポジトリで更新