From febefc3f89328f546b87fdf6bbffe5969cbfed60 Mon Sep 17 00:00:00 2001 From: fukahorids Date: Sun, 25 May 2025 10:38:22 +0900 Subject: [PATCH 01/16] add 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..99c7b7d92 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +newfile作成 \ No newline at end of file From 58944087ea86a1d341e8ea4188091814b2cc0f38 Mon Sep 17 00:00:00 2001 From: fukahorids Date: Sun, 25 May 2025 10:48:55 +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 bc16a2cd28b5b9ae6f176b661994391bacb8ee8e Mon Sep 17 00:00:00 2001 From: fukahorids Date: Sun, 25 May 2025 11:01:00 +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 7b8e71c601aaea271137061f37d3557fa50a4372 Mon Sep 17 00:00:00 2001 From: fukahorids Date: Sun, 25 May 2025 11:47:24 +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 a26a8d51b2ba7970bd5979f4f17af51d4174a783 Mon Sep 17 00:00:00 2001 From: fukahorids Date: Sun, 25 May 2025 11:48:47 +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 ef1e933018eb776af01bfa5b7b9a4ba5d49decb3 Mon Sep 17 00:00:00 2001 From: fukahorids Date: Sun, 25 May 2025 11:58:09 +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 509d161eec58c23923537f1cdb0462754145aa7f Mon Sep 17 00:00:00 2001 From: fukahorids Date: Sun, 25 May 2025 12:26:35 +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 01e4642dcba015fedf1a789dd77c36b97d93edc4 Mon Sep 17 00:00:00 2001 From: fukahorids Date: Sun, 25 May 2025 13:30:46 +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..d53152b7e 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 4376b0b9546beb866bb922af98e396c36c8e3c61 Mon Sep 17 00:00:00 2001 From: fukahorids Date: Sun, 25 May 2025 14:49:14 +0900 Subject: [PATCH 09/16] up date readme for automatic merge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d53152b7e..a7913c845 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 eccb23c40a6a2bb8b69302f769da7e76a631a5bb Mon Sep 17 00:00:00 2001 From: fukahorids Date: Sun, 25 May 2025 14:52:54 +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 db9269cac39618afd48e0a5ef74917249d87aea9 Mon Sep 17 00:00:00 2001 From: fukahorids Date: Sun, 25 May 2025 15:35:40 +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 a7913c845..e26abfb5c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forwardブランチで変更 \ No newline at end of file +conflictブランチで変更（コンフリクト発生） \ No newline at end of file From ab3f69caf6a3a6399b4ef35cad840bc96468761e Mon Sep 17 00:00:00 2001 From: fukahorids Date: Sun, 25 May 2025 15:39:10 +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 a7913c845..99b4dead9 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 4250ab8b90f2952f67b91101c5cda9f708850828 Mon Sep 17 00:00:00 2001 From: Daisuke Fukahori <88496754+fukahorids@users.noreply.github.com> Date: Sun, 25 May 2025 16:09:29 +0900 Subject: [PATCH 13/16] update readme on github --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b59d03171..c2315b5bf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで変更（コンフリクト発生） +Github上で更新 From db21736ee15ec3b59813328b14e7131dfc9bcad4 Mon Sep 17 00:00:00 2001 From: Daisuke Fukahori <88496754+fukahorids@users.noreply.github.com> Date: Sun, 25 May 2025 18:46:19 +0900 Subject: [PATCH 14/16] update readme on github for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c2315b5bf..2f3c3101e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -Github上で更新 +Github上で更新２回目 From f926b9512204d94454b9c3520ad1fb816f9e8803 Mon Sep 17 00:00:00 2001 From: fukahorids Date: Sun, 25 May 2025 18:50:18 +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 c2315b5bf..275e72b7e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -Github上で更新 +conflict-remote上で更新（コンフリクト発生） From 4e987fdfb91ff886d2637b4e9512041208ef0953 Mon Sep 17 00:00:00 2001 From: fukahorids Date: Sun, 25 May 2025 20:29:46 +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 8eca2b4b6..41714aff4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -conflict-remote上で更新（コンフリクト発生） \ No newline at end of file +自分のリポジトリで更新 \ No newline at end of file