From e92f7640436cbeb37fa05ab1e5723899c53bb730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AA=E3=82=B9=E3=83=88=E3=83=AF=E3=83=AB=E3=83=88?= =?UTF-8?q?=E6=B3=95?= Date: Mon, 10 Nov 2025 00:54:26 +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 3a8538c15aaa80397c621ab27dd18b099e741c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AA=E3=82=B9=E3=83=88=E3=83=AF=E3=83=AB=E3=83=88?= =?UTF-8?q?=E6=B3=95?= Date: Mon, 10 Nov 2025 01:13:14 +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 6a8035c3f90f8a11e977e50b47cea661a85e7d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AA=E3=82=B9=E3=83=88=E3=83=AF=E3=83=AB=E3=83=88?= =?UTF-8?q?=E6=B3=95?= Date: Mon, 10 Nov 2025 01:18:37 +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 b71bb2989226f88c1e1c066a87f403b24e994674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AA=E3=82=B9=E3=83=88=E3=83=AF=E3=83=AB=E3=83=88?= =?UTF-8?q?=E6=B3=95?= Date: Mon, 10 Nov 2025 01:47:53 +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 8754acaa5c31e56741d7f7f28403256168202f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AA=E3=82=B9=E3=83=88=E3=83=AF=E3=83=AB=E3=83=88?= =?UTF-8?q?=E6=B3=95?= Date: Mon, 10 Nov 2025 01:49:37 +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 02716782afcbf3c89777425256226355a773530b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AA=E3=82=B9=E3=83=88=E3=83=AF=E3=83=AB=E3=83=88?= =?UTF-8?q?=E6=B3=95?= Date: Mon, 10 Nov 2025 02:15:55 +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 e5484d160b7d47c8ec2bbfaeaefefcd4dc7e5e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AA=E3=82=B9=E3=83=88=E3=83=AF=E3=83=AB=E3=83=88?= =?UTF-8?q?=E6=B3=95?= Date: Mon, 10 Nov 2025 04:20:57 +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 9553ffe5491feae637d03d462a33146e46e5d7ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AA=E3=82=B9=E3=83=88=E3=83=AF=E3=83=AB=E3=83=88?= =?UTF-8?q?=E6=B3=95?= Date: Mon, 10 Nov 2025 14:07:27 +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..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 b8aa39716cc676dc91227a1afacb0d2f2e843c32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AA=E3=82=B9=E3=83=88=E3=83=AF=E3=83=AB=E3=83=88?= =?UTF-8?q?=E6=B3=95?= Date: Mon, 10 Nov 2025 15:29:05 +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 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 a162ee763018a4963b5aa73c09e8aa971529896c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AA=E3=82=B9=E3=83=88=E3=83=AF=E3=83=AB=E3=83=88?= =?UTF-8?q?=E6=B3=95?= Date: Mon, 10 Nov 2025 15:53:12 +0900 Subject: [PATCH 10/16] make ne 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 c7398d2fdbb2c07e18f17c78dc841f39a224364f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AA=E3=82=B9=E3=83=88=E3=83=AF=E3=83=AB=E3=83=88?= =?UTF-8?q?=E6=B3=95?= Date: Mon, 10 Nov 2025 16:17:41 +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 76afd9a52..e71d294a5 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 12ea458603bc4a4dcf895351a4567eeb16f2d3ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AA=E3=82=B9=E3=83=88=E3=83=AF=E3=83=AB=E3=83=88?= =?UTF-8?q?=E6=B3=95?= Date: Mon, 10 Nov 2025 16:22:53 +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 76afd9a52..a410ca31f 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 037937f3414df8422cf17dae3ee5feb94e864e95 Mon Sep 17 00:00:00 2001 From: Lie2005-714 Date: Wed, 12 Nov 2025 12:47:55 +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 706b63791..a24f88a6a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで変更（コンフリクト発生) +Github上で更新 From 92ed1a0c245462df2739d266510206c12d79c09e Mon Sep 17 00:00:00 2001 From: Lie2005-714 Date: Wed, 12 Nov 2025 13:00:01 +0900 Subject: [PATCH 14/16] =?UTF-8?q?Update=20README.md=E3=80=80on=20github=20?= =?UTF-8?q?for=20conflict?= 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 a24f88a6a..ddfabd419 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -Github上で更新 +Github上で更新2回目 From 4870756952a91d03497715a36b898064e10fa920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AA=E3=82=B9=E3=83=88=E3=83=AF=E3=83=AB=E3=83=88?= =?UTF-8?q?=E6=B3=95?= Date: Wed, 12 Nov 2025 13:04:08 +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 a24f88a6a..c271a9458 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -Github上で更新 +conflict-remote上で更新(コンフリクト発生) From c9d3585a9147a42a571c480374d848770a653fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AA=E3=82=B9=E3=83=88=E3=83=AF=E3=83=AB=E3=83=88?= =?UTF-8?q?=E6=B3=95?= Date: Wed, 12 Nov 2025 14:01:35 +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 762a90cdf..6b48e0bbf 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -conflict-remote上で更新(コンフリクト発生) +自分のリポジトリで更新