From 6bb7d3147a1ead5df7032391367442bf7132ac8c Mon Sep 17 00:00:00 2001 From: kemura0315-cyber Date: Sun, 28 Jun 2026 15:28:01 +0900 Subject: [PATCH 01/15] 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 94db0b44e49fd4ba34d09077664755eb842436a7 Mon Sep 17 00:00:00 2001 From: kemura0315-cyber Date: Sun, 28 Jun 2026 15:45:54 +0900 Subject: [PATCH 02/15] 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 8a3bd0612f50c03a7219e889dfcc4e6b6245066f Mon Sep 17 00:00:00 2001 From: kemura0315-cyber Date: Sun, 28 Jun 2026 15:50:46 +0900 Subject: [PATCH 03/15] 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 e9d4fdab5937a0749dd19fdbe28cdc63aeaaeb4e Mon Sep 17 00:00:00 2001 From: kemura0315-cyber Date: Sun, 28 Jun 2026 16:01:10 +0900 Subject: [PATCH 04/15] 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 98d840085637c4baee511920e13ab0d7fd091ce4 Mon Sep 17 00:00:00 2001 From: kemura0315-cyber Date: Sun, 28 Jun 2026 16:03:09 +0900 Subject: [PATCH 05/15] 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 04186465dfa2f1a986dbbf955f7ced5d4c75b5c4 Mon Sep 17 00:00:00 2001 From: kemura0315-cyber Date: Sun, 28 Jun 2026 16:18:20 +0900 Subject: [PATCH 06/15] SS --- 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 774e377fbfe4f4ab807a3391954965a404694d8d Mon Sep 17 00:00:00 2001 From: kemura0315-cyber Date: Mon, 29 Jun 2026 09:42:28 +0900 Subject: [PATCH 07/15] update readme --- .gitignore | 1 + README.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) 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 diff --git a/README.md b/README.md index e05b801e5..8111cd89c 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 2cd2574aeb7f08d138d42f4b341197ea485fe630 Mon Sep 17 00:00:00 2001 From: kemura0315-cyber Date: Mon, 29 Jun 2026 10:02:28 +0900 Subject: [PATCH 08/15] update readme for autmaticmarge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8111cd89c..5c3d821b3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -new-feature \ No newline at end of file +new-featureで変更 \ No newline at end of file From 54b0c84abe12b1be35bbe7235caef3a2a38b9656 Mon Sep 17 00:00:00 2001 From: kemura0315-cyber Date: Mon, 29 Jun 2026 10:05:32 +0900 Subject: [PATCH 09/15] 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..cea55e870 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created new file \ No newline at end of file From 9af342e46bb697cf220d77846ad0c50af225f04d Mon Sep 17 00:00:00 2001 From: kemura0315-cyber Date: Mon, 29 Jun 2026 10:21:20 +0900 Subject: [PATCH 10/15] Updateread me conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c3d821b3..1dda80a67 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -new-featureで変更 \ No newline at end of file +conflictで変更 \ No newline at end of file From 0ecdb7f6d594588d8fe5176c6690415805b38ae2 Mon Sep 17 00:00:00 2001 From: kemura0315-cyber Date: Mon, 29 Jun 2026 10:24:00 +0900 Subject: [PATCH 11/15] update for README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c3d821b3..398899199 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -new-featureで変更 \ No newline at end of file +mainで変更 conflict発生 \ No newline at end of file From 5649c57f2b509c58d17165f27ba6a2582f4b52af Mon Sep 17 00:00:00 2001 From: kemura0315-cyber Date: Mon, 29 Jun 2026 21:12:18 +0900 Subject: [PATCH 12/15] Update README.md update an optional file --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 36a00b6c8..9b041f8a9 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更 conflictで変更 +git hub上で変更 From d501106befe1e2842e2f6f036591584eaa2c8eb1 Mon Sep 17 00:00:00 2001 From: kemura0315-cyber Date: Mon, 29 Jun 2026 21:24:13 +0900 Subject: [PATCH 13/15] Update README.md update commit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9b041f8a9..112168beb 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更 conflictで変更 -git hub上で変更 +git hub上で変更 (hennkou) From 9e8d110ced1772d85ee0805fc8718ba72129657e Mon Sep 17 00:00:00 2001 From: kemura0315-cyber Date: Mon, 29 Jun 2026 21:31:00 +0900 Subject: [PATCH 14/15] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9b041f8a9..7fcbca63d 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更 conflictで変更 -git hub上で変更 +conflict-remote From b7698c9acccc8dcecd397e600f417cd9361cac8e Mon Sep 17 00:00:00 2001 From: kemura0315-cyber Date: Mon, 29 Jun 2026 21:56:45 +0900 Subject: [PATCH 15/15] update readme --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 112168beb..4534fd134 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictで変更 -git hub上で変更 (hennkou) +自分のリポジトリを更新