From c597ee63ba76b31171553f4093251cc91ed4fb82 Mon Sep 17 00:00:00 2001 From: Penchop Date: Thu, 7 May 2026 06:31:31 +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 f5fc24614431ef0bdda484efeedfb97f73cb6b8e Mon Sep 17 00:00:00 2001 From: Penchop Date: Sun, 10 May 2026 09:02: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 345fc07a805126a5d8c7c6ae3bc338cbb8d95eaa Mon Sep 17 00:00:00 2001 From: Penchop Date: Sun, 10 May 2026 09:08:18 +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 0e5c0dd0e268f14936d8235b88b5a958949e037a Mon Sep 17 00:00:00 2001 From: Penchop Date: Sun, 10 May 2026 09:48:13 +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 5ce4e4c5d965fd690fb14bee9744aaeb0169cdb8 Mon Sep 17 00:00:00 2001 From: Penchop Date: Mon, 11 May 2026 07:27:07 +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 5992d3438771330ab3835e923e520bb0d9125116 Mon Sep 17 00:00:00 2001 From: Penchop Date: Mon, 11 May 2026 07:29:18 +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 c0f36686d3d5878f69f8a1e5ad76ab88aa79a4ce Mon Sep 17 00:00:00 2001 From: Penchop Date: Fri, 15 May 2026 06:59:08 +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 eb460b913a278c56e220db6fdb8fa12373a0921c Mon Sep 17 00:00:00 2001 From: Penchop Date: Sat, 16 May 2026 20:56:26 +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 f7ddea00e91d2e89af9c3c9fd427e82b9aa33334 Mon Sep 17 00:00:00 2001 From: Penchop Date: Fri, 29 May 2026 23:22:24 +0900 Subject: [PATCH 09/16] update readme for autmatic 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 e851ae53352027ed28b9062b981adaa3a6c3d277 Mon Sep 17 00:00:00 2001 From: Penchop Date: Fri, 29 May 2026 23:27:02 +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 78c51aeb76266227c9bda776501659ce732916fe Mon Sep 17 00:00:00 2001 From: Penchop Date: Mon, 1 Jun 2026 07:18:51 +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..d320eac15 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 5c6eaad730543b597217a58a65f3f9c3287a7303 Mon Sep 17 00:00:00 2001 From: Penchop Date: Mon, 1 Jun 2026 07:21:18 +0900 Subject: [PATCH 12/16] update readme on main for confilict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 76afd9a52..9959792f7 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 c46ab02c25e759b4c927d9c13d5900c3e8803b19 Mon Sep 17 00:00:00 2001 From: Penchop Date: Mon, 1 Jun 2026 07:45:58 +0900 Subject: [PATCH 13/16] Update README.md on GitHub --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d320eac15..1c0d4b64b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで変更(コンフリクト発生) \ No newline at end of file +GitHub上で変更 From 5c60beab840337d94a048a783af2fcf7c83149ca Mon Sep 17 00:00:00 2001 From: Penchop Date: Thu, 4 Jun 2026 02:05:33 +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 1c0d4b64b..cd47895dd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -GitHub上で変更 +GitHub上で更新2回目 From 79c5069e36daad714d5d83707a2a4bfddbca5659 Mon Sep 17 00:00:00 2001 From: Penchop Date: Thu, 4 Jun 2026 02:07:51 +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 1c0d4b64b..c271a9458 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -GitHub上で変更 +conflict-remote上で更新(コンフリクト発生) From a3520cfa2e9d7e045b1cacbfeaf765e081e48b5e Mon Sep 17 00:00:00 2001 From: Penchop Date: Sat, 13 Jun 2026 02:46:19 +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 cb437fbf7..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