From 7b17b5de2b171d15e4c8e1d28e3e2ef4224954d6 Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 08:18:50 +0900 Subject: [PATCH 01/19] 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 11ad7b3a11e2a551d458d90caeecf1f372601e30 Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 11:04:10 +0900 Subject: [PATCH 02/19] change name --- newfile.txt => namechange.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename newfile.txt => namechange.txt (100%) diff --git a/newfile.txt b/namechange.txt similarity index 100% rename from newfile.txt rename to namechange.txt From 8bdc6b5c8c565d7208819b3cc4d82455fe33f0cb Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 11:09:40 +0900 Subject: [PATCH 03/19] change name again --- README.md | 1 + namechange.txt => namechanged2.txt | 0 2 files changed, 1 insertion(+) rename namechange.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/namechange.txt b/namechanged2.txt similarity index 100% rename from namechange.txt rename to namechanged2.txt From 946907855e26d7c4e324450aac749399bf405e72 Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 11:16:47 +0900 Subject: [PATCH 04/19] 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 0c56bb4a33b004674cfc0e3b21633e4ec0f9fdf6 Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 11:40:28 +0900 Subject: [PATCH 05/19] make new file --- delete_soo.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 delete_soo.txt diff --git a/delete_soo.txt b/delete_soo.txt new file mode 100644 index 000000000..e69de29bb From 20bebf2264d4769e10248df8dc1c970625d00961 Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 11:42:25 +0900 Subject: [PATCH 06/19] delete file --- delete_soo.txt | 0 delete_soon.txt | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 delete_soo.txt delete mode 100644 delete_soon.txt diff --git a/delete_soo.txt b/delete_soo.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/delete_soon.txt b/delete_soon.txt deleted file mode 100644 index e69de29bb..000000000 From 077c0caeb02b9b11380e2abf3d32ad81dc35d992 Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 11:44:56 +0900 Subject: [PATCH 07/19] 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 68c3463fe3906c95771f843b1b1aef26a046c9c4 Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 12:02:40 +0900 Subject: [PATCH 08/19] .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 7208d462327e060c5550b9dbc17c25ac3b9f98ca Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 12:33:49 +0900 Subject: [PATCH 09/19] update readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e05b801e5..75ea51dd0 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 3a4ae0604388668cb89a1b3c7451dc2854894250 Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 12:44:03 +0900 Subject: [PATCH 10/19] no-fast-forward --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 75ea51dd0..76afd9a52 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 d63bddc23b8313c3779f03d91cde2861663283ed Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 12:46:10 +0900 Subject: [PATCH 11/19] mainno-newfile.txt --- 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..c78316bcb --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +mainで作成 \ No newline at end of file From 60012efdad25cd9dadeb53577e80407dd40d2fd5 Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 13:02:26 +0900 Subject: [PATCH 12/19] README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 76afd9a52..2b89a32f2 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 c3609ca22712bc2364132956c159678595f0a317 Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 13:04:05 +0900 Subject: [PATCH 13/19] README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 76afd9a52..5d2f375c2 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 e3d8348f87482845d0c4728c1c9e95c00ea490c5 Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 13:36:55 +0900 Subject: [PATCH 14/19] =?UTF-8?q?Update=20README=E3=80=80on=20github?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2d5662389..fb0b01559 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,5 @@ このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictでブランチで変更 \ No newline at end of file +conflictでブランチで変更 +github上で更新 From d075060edd137afbcb08db380f635f2bb52a691f Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 13:43:29 +0900 Subject: [PATCH 15/19] Update README conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fb0b01559..4f2c54d63 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ ローカルリポで変更 conflictでブランチで変更 -github上で更新 +github上で更新2 From 91a3c4c643fe631178ab9b67a580d944eea78216 Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 13:45:27 +0900 Subject: [PATCH 16/19] 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 fb0b01559..6334f7dcf 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ ローカルリポで変更 conflictでブランチで変更 -github上で更新 +github上でコンフリクト発生 From 6a59385f6a7bd408a793665e3820ce9a4273f59f Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 13:54:48 +0900 Subject: [PATCH 17/19] resolve conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6334f7dcf..07d5354bd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# git-practice +git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 From f9eef714d137542f17e77a750e5dd74b96b8f7fc Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 13:57:22 +0900 Subject: [PATCH 18/19] Update README conflict gassed --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4f2c54d63..af39f1198 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ ローカルリポで変更 conflictでブランチで変更 -github上で更新2 +github上で更新2sitayatu From cbd92b18b7664a083ece068ee897beba3c86d964 Mon Sep 17 00:00:00 2001 From: teaMitea Date: Sat, 31 May 2025 13:59:47 +0900 Subject: [PATCH 19/19] update readme on conflict-remote on conflict2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 07d5354bd..b20c3fa07 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ git-practice ローカルリポで変更 conflictでブランチで変更 -github上でコンフリクト発生 +conflict-remote上で更新コンフリクト発生