From ce601886234dcd07eb84f221b25fecd02cddebee Mon Sep 17 00:00:00 2001 From: dtrackerhero Date: Mon, 9 Mar 2026 15:35:19 +0900 Subject: [PATCH 01/16] Create a 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..8e8eb40ed --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +A new file created by hy. From a7ccee84c8927f48880077f158d9557ae24ec603 Mon Sep 17 00:00:00 2001 From: dtrackerhero Date: Mon, 9 Mar 2026 17:04:51 +0900 Subject: [PATCH 02/16] changed filename --- 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 c2da49bc944153312c2b052b70476d03a5f36fe8 Mon Sep 17 00:00:00 2001 From: dtrackerhero Date: Tue, 10 Mar 2026 05:31:19 +0900 Subject: [PATCH 03/16] changed filename with mv command --- README.md | 2 ++ namechanged.txt => namechanged2.txt | 0 2 files changed, 2 insertions(+) rename namechanged.txt => namechanged2.txt (100%) diff --git a/README.md b/README.md index 9e7d03700..d881eb328 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # git-practice + このリポジトリはGit動画講座用です． +ローカルリポジトリで変更 diff --git a/namechanged.txt b/namechanged2.txt similarity index 100% rename from namechanged.txt rename to namechanged2.txt From 4d28a82e7a02b676599b22e4cbfe965d19837103 Mon Sep 17 00:00:00 2001 From: dtrackerhero Date: Tue, 10 Mar 2026 18:27:27 +0900 Subject: [PATCH 04/16] made a new file to practice git rm --- 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 738b9e894de7cc49e80499eb50af60de9a3ed085 Mon Sep 17 00:00:00 2001 From: dtrackerhero Date: Tue, 10 Mar 2026 18:29:40 +0900 Subject: [PATCH 05/16] delete the 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 99570f516fdc66d956b52463ed62c728c1f41af7 Mon Sep 17 00:00:00 2001 From: dtrackerhero Date: Tue, 10 Mar 2026 18:32:25 +0900 Subject: [PATCH 06/16] made delete_soon.txt file again --- 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 62d8a5f7dbe7115a90f1c3697db55f3cc3717ea5 Mon Sep 17 00:00:00 2001 From: dtrackerhero Date: Wed, 11 Mar 2026 18:28:20 +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..9aa6a64e3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +output.log From ac4fb45477bd33c6d8ecb094b7920505f3402885 Mon Sep 17 00:00:00 2001 From: dtrackerhero Date: Thu, 12 Mar 2026 18:46:20 +0900 Subject: [PATCH 08/16] modefied README.md in new-feature branch --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d881eb328..c9e5fbf3d 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポジトリで変更 +new-featureブランチで変更 From e461f5fbea7423f12f9bbb1fcee93d8984ff129f Mon Sep 17 00:00:00 2001 From: dtrackerhero Date: Fri, 13 Mar 2026 07:58:01 +0900 Subject: [PATCH 09/16] modified README.md at no-fast-forward --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c9e5fbf3d..1aa63b359 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,4 @@ このリポジトリはGit動画講座用です． ローカルリポジトリで変更 new-featureブランチで変更 +no-fast-forwardで変更 From fa8461c32c3ae3318f38b248a2c237c8c00ab207 Mon Sep 17 00:00:00 2001 From: dtrackerhero Date: Fri, 13 Mar 2026 08:02:40 +0900 Subject: [PATCH 10/16] creaded a newfile.txt at main --- 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..84e376f40 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created a new file at main branch From 86b4f7650135b9c9437cfcacf4f29a3ae8d1baed Mon Sep 17 00:00:00 2001 From: dtrackerhero Date: Sat, 14 Mar 2026 07:30:52 +0900 Subject: [PATCH 11/16] update README.md to make a conflict at conflict branch --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1aa63b359..1007e08a6 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,4 @@ ローカルリポジトリで変更 new-featureブランチで変更 no-fast-forwardで変更 +conflictを起こすために変更(at conflict branch) From 83295a7fa6333bd7ae308e50a214f9dda0066554 Mon Sep 17 00:00:00 2001 From: dtrackerhero Date: Sat, 14 Mar 2026 07:34:47 +0900 Subject: [PATCH 12/16] update README.md to make a conflict at main branch --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1aa63b359..b6a891e78 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,4 @@ ローカルリポジトリで変更 new-featureブランチで変更 no-fast-forwardで変更 +コンフリクトを起こすために変更(at main branch) From 6271ede9efd9c459850738f0fbf5be9ff56ddde7 Mon Sep 17 00:00:00 2001 From: dtrackerhero <87851645+dtrackerhero@users.noreply.github.com> Date: Sat, 14 Mar 2026 11:05:29 +0900 Subject: [PATCH 13/16] Add note about changes in remote repository --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1007e08a6..96b451e99 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,4 @@ new-featureブランチで変更 no-fast-forwardで変更 conflictを起こすために変更(at conflict branch) +fetchのためにリモートリポジトリで変更(at main branch) From bdc5f065396a60f8e595a874d20432103a0414fa Mon Sep 17 00:00:00 2001 From: dtrackerhero <87851645+dtrackerhero@users.noreply.github.com> Date: Sat, 14 Mar 2026 16:46:07 +0900 Subject: [PATCH 14/16] Add note about conflict resolution on pull --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 96b451e99..b5db81c6c 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,4 @@ new-featureブランチで変更 no-fast-forwardで変更 conflictを起こすために変更(at conflict branch) fetchのためにリモートリポジトリで変更(at main branch) +pullしたときのコンフリクト対処のために変更(at origin/main) From 4a6054caec65f6d62f48392f3433dd1eaffd386c Mon Sep 17 00:00:00 2001 From: dtrackerhero Date: Sat, 14 Mar 2026 16:50:15 +0900 Subject: [PATCH 15/16] update README.md to make a conflict at conflict-remote branch --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 96b451e99..9aa1108f0 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,4 @@ new-featureブランチで変更 no-fast-forwardで変更 conflictを起こすために変更(at conflict branch) fetchのためにリモートリポジトリで変更(at main branch) +conflictを起こすためにローカルリポジトリで変更(at conflict-remote branch) From 4bd15d13ec8caee6f9d67699367e8e99a5da5fc8 Mon Sep 17 00:00:00 2001 From: dtrackerhero Date: Tue, 17 Mar 2026 06:05:44 +0900 Subject: [PATCH 16/16] update README.md to make a pull request to the original repository I forked --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 9aa1108f0..3ff39bab2 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポジトリで変更 -new-featureブランチで変更 -no-fast-forwardで変更 -conflictを起こすために変更(at conflict branch) -fetchのためにリモートリポジトリで変更(at main branch) -conflictを起こすためにローカルリポジトリで変更(at conflict-remote branch) +自分のローカルリポジトリで変更