From 3b57ede1143535bbadb701075871ca01c3181fa1 Mon Sep 17 00:00:00 2001 From: Tomo Saya Date: Mon, 11 Aug 2025 22:14:48 +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..99c7b7d92 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +newfile作成 \ No newline at end of file From 6a14352682a2585e29dd7a74627f6ab84b2f67e3 Mon Sep 17 00:00:00 2001 From: Tomo Saya Date: Mon, 11 Aug 2025 22:33:12 +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 ea8e0529658f123fe8598cd86dfb2a37140be65a Mon Sep 17 00:00:00 2001 From: Tomo Saya Date: Mon, 11 Aug 2025 22:37:57 +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 0465490334655b4093cbbe3d74e45f9622bcdf07 Mon Sep 17 00:00:00 2001 From: Tomo Saya Date: Mon, 11 Aug 2025 23:06:07 +0900 Subject: [PATCH 04/16] make new file --- delete_sonn.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 delete_sonn.txt diff --git a/delete_sonn.txt b/delete_sonn.txt new file mode 100644 index 000000000..e69de29bb From ef49bdc03fcbae3f7b2bb398d7d73b56758a337e Mon Sep 17 00:00:00 2001 From: Tomo Saya Date: Mon, 11 Aug 2025 23:07:22 +0900 Subject: [PATCH 05/16] delete file --- delete_sonn.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 delete_sonn.txt diff --git a/delete_sonn.txt b/delete_sonn.txt deleted file mode 100644 index e69de29bb..000000000 From dafabca0851212aaee474d2002952fcf6b944865 Mon Sep 17 00:00:00 2001 From: Tomo Saya Date: Mon, 11 Aug 2025 23:09:34 +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 0e09fc367658f4779b77c5b0f64e45ba8f3813ed Mon Sep 17 00:00:00 2001 From: Tomo Saya Date: Mon, 11 Aug 2025 23:28:05 +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 e9a238787e97522cc94aeb454e1b8bb40b2abe7c Mon Sep 17 00:00:00 2001 From: Tomo Saya Date: Wed, 13 Aug 2025 05:45:14 +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..0c3597344 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 1708397a646796f12752e1bf38867a0e37df60fc Mon Sep 17 00:00:00 2001 From: Tomo Saya Date: Wed, 13 Aug 2025 06:01:52 +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 0c3597344..b84c492b0 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 ec332817a90f3c5711e71b0610f05e32d4923268 Mon Sep 17 00:00:00 2001 From: Tomo Saya Date: Wed, 13 Aug 2025 06:05:03 +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..3a63a982e --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created new file!! \ No newline at end of file From f5be698bd6c536f491867728cbc3c5707ea02c86 Mon Sep 17 00:00:00 2001 From: Tomo Saya Date: Thu, 14 Aug 2025 05:17:06 +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 b84c492b0..96429b23f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更　 -no-fast-forwardブランチで変更 \ No newline at end of file +conglictブランチで変更(コンフリクト発生) \ No newline at end of file From 0c9e7e8426e0cf909e10f1a33d452e41e7228bb0 Mon Sep 17 00:00:00 2001 From: Tomo Saya Date: Thu, 14 Aug 2025 05:20:05 +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 b84c492b0..480de75f6 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 702baa0fe492b83ab94712d7ca91e3c94977f3f0 Mon Sep 17 00:00:00 2001 From: Tomo Saya <99233761+Tomo-Saya@users.noreply.github.com> Date: Thu, 14 Aug 2025 05:42:40 +0900 Subject: [PATCH 13/16] Update README.md update readme on github --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 96429b23f..36f8da016 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更　 -conglictブランチで変更(コンフリクト発生) \ No newline at end of file +Github上で更新 From 135f3b61569b2182b8c914f93dae09e7fdeea58b Mon Sep 17 00:00:00 2001 From: Tomo Saya <99233761+Tomo-Saya@users.noreply.github.com> Date: Thu, 14 Aug 2025 05:54:37 +0900 Subject: [PATCH 14/16] Update README.md update readme on github for conflict --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 36f8da016..ddfabd419 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更　 -Github上で更新 +ローカルリポで変更 +Github上で更新2回目 From d61a87547e1a9ab3504b08c3004bb8aa1b71b0f5 Mon Sep 17 00:00:00 2001 From: Tomo Saya Date: Thu, 14 Aug 2025 05:58:03 +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 36f8da016..ff965d08d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更　 -Github上で更新 +conflict-remote上で更新(conflict発生) From af61482c08c75d0cc43bbcfe074d08b70cda744c Mon Sep 17 00:00:00 2001 From: Tomo Saya Date: Thu, 14 Aug 2025 06:24:45 +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 177185af8..41714aff4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更　 -conflict-remote上で更新(conflict発生) \ No newline at end of file +自分のリポジトリで更新 \ No newline at end of file