From c9fc041f81c84bdfe60d252b2bca6bad384dfacc Mon Sep 17 00:00:00 2001 From: iolie3 Date: Tue, 24 Jun 2025 00:54:47 +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 fe29b8cbc1c20d4c2cd7ff626b98d5d3771a17d5 Mon Sep 17 00:00:00 2001 From: iolie3 Date: Thu, 26 Jun 2025 15:32:49 +0900 Subject: [PATCH 02/16] namechanged.txt --- 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 9a996c2dc7cff04479df95ca1e6a1ee6876e7101 Mon Sep 17 00:00:00 2001 From: iolie3 Date: Thu, 26 Jun 2025 15:47:18 +0900 Subject: [PATCH 03/16] namechanged.txt --- README.md | 1 + namechanged.txt => namechanged3.txt | 0 2 files changed, 1 insertion(+) rename namechanged.txt => namechanged3.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/namechanged3.txt similarity index 100% rename from namechanged.txt rename to namechanged3.txt From 0857ef930309259fb664f42cc1199ce996a606da Mon Sep 17 00:00:00 2001 From: iolie3 Date: Thu, 26 Jun 2025 16:18:29 +0900 Subject: [PATCH 04/16] delete_soon.txt --- 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 64d6a07bd4ce8f2adb485a74de4d9f2c649e0fc6 Mon Sep 17 00:00:00 2001 From: iolie3 Date: Thu, 26 Jun 2025 16:22:11 +0900 Subject: [PATCH 05/16] delete_soon.txt --- 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 9eafce5a3c08ac934559807ff7c8cc5cc7109053 Mon Sep 17 00:00:00 2001 From: iolie3 Date: Thu, 26 Jun 2025 16:26:06 +0900 Subject: [PATCH 06/16] newfile --- 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 883319c7bbaebb25c45b2e4e7db877451950bf94 Mon Sep 17 00:00:00 2001 From: iolie3 Date: Thu, 26 Jun 2025 21:09:43 +0900 Subject: [PATCH 07/16] .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 71b802dac668cc4297113734a3ea55fc40a24ee7 Mon Sep 17 00:00:00 2001 From: iolie3 Date: Thu, 26 Jun 2025 22:10:36 +0900 Subject: [PATCH 08/16] updete readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e05b801e5..bb9747491 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 3919db4ae02ba4674b7ee3c3baef99d70918d254 Mon Sep 17 00:00:00 2001 From: iolie3 Date: Fri, 27 Jun 2025 17:26:36 +0900 Subject: [PATCH 09/16] up date README for autmatic merge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bb9747491..3b3ee01e2 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 553e0f338403cd8cdc62c8ded2fe8fc4fafc83c2 Mon Sep 17 00:00:00 2001 From: iolie3 Date: Fri, 27 Jun 2025 17:32:57 +0900 Subject: [PATCH 10/16] make 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..3a63a982e --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created new file!! \ No newline at end of file From b1fe3daace26c6a367b7ab0dd973768fab246d83 Mon Sep 17 00:00:00 2001 From: iolie3 Date: Fri, 27 Jun 2025 21:03:14 +0900 Subject: [PATCH 11/16] update readme on conflict branchfor conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3b3ee01e2..e9024bd52 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更　　 -no-fast-forwardブランチで変更 \ No newline at end of file +confilctブランチで変更変更（コンフリクト発生） \ No newline at end of file From b17d8d6ff7b5bfe1bb40ae5c43f1a60633e19194 Mon Sep 17 00:00:00 2001 From: iolie3 Date: Fri, 27 Jun 2025 21:09:30 +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 3b3ee01e2..b05e24d66 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 e385f6aca5e023cc1a356a492cf66a69c6af0220 Mon Sep 17 00:00:00 2001 From: iolie3 Date: Fri, 27 Jun 2025 23:34:45 +0900 Subject: [PATCH 13/16] =?UTF-8?q?Update=20README.md=E3=80=80on=20github?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0f1513172..65acddd41 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更　　 confilctブランチで変更変更（コンフリクト発生） ->>>>>>> conflict +github上で更新 From 624404f2cc199a97196ed094beeb2b26e3f02a72 Mon Sep 17 00:00:00 2001 From: iolie3 Date: Sat, 28 Jun 2025 00:03:45 +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 65acddd41..6f523da73 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更　　 confilctブランチで変更変更（コンフリクト発生） -github上で更新 +github上で更新2回目 From 2c61e4edf0952bccf8905d5f964979abb660278c Mon Sep 17 00:00:00 2001 From: iolie3 Date: Sat, 28 Jun 2025 00:08:18 +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 65acddd41..79cb8dca5 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更　　 confilctブランチで変更変更（コンフリクト発生） -github上で更新 +conflict-remote上で更新(コンフリクト発生) From a5e02825dc6a132e383e0ce6773b0b843d2be544 Mon Sep 17 00:00:00 2001 From: iolie3 Date: Thu, 3 Jul 2025 15:59:18 +0900 Subject: [PATCH 16/16] update readme --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 79cb8dca5..99962452d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更　　 -confilctブランチで変更変更（コンフリクト発生） -conflict-remote上で更新(コンフリクト発生) +自分のリポジトリで変更 \ No newline at end of file