From 9101af44b87e9a436bee98f8425f1b9f475c7c79 Mon Sep 17 00:00:00 2001 From: nn-sec Date: Fri, 30 Jan 2026 12:32:04 +0900 Subject: [PATCH 01/16] add newfile --- newfile.text | 1 + 1 file changed, 1 insertion(+) create mode 100644 newfile.text diff --git a/newfile.text b/newfile.text new file mode 100644 index 000000000..5f25aa713 --- /dev/null +++ b/newfile.text @@ -0,0 +1 @@ +9mon 作成 \ No newline at end of file From d6b398652fdcbf31eab3ca8052670243e026cabe Mon Sep 17 00:00:00 2001 From: nn-sec Date: Sat, 31 Jan 2026 18:28:06 +0900 Subject: [PATCH 02/16] change name --- newfile.text => namechnged.text | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename newfile.text => namechnged.text (100%) diff --git a/newfile.text b/namechnged.text similarity index 100% rename from newfile.text rename to namechnged.text From 843c2281582277059a20bf05270c875087c5f669 Mon Sep 17 00:00:00 2001 From: nn-sec Date: Sat, 31 Jan 2026 18:38:43 +0900 Subject: [PATCH 03/16] change name again --- README.md | 2 +- namechnged.text => namechanged2.text | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename namechnged.text => namechanged2.text (100%) diff --git a/README.md b/README.md index 9e7d03700..eda4424cc 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # git-practice -このリポジトリはGit動画講座用です． +ローカル練習用 \ No newline at end of file diff --git a/namechnged.text b/namechanged2.text similarity index 100% rename from namechnged.text rename to namechanged2.text From 9f08d5118c0ff97f2ba4bb23c9d6d3d7ccb20081 Mon Sep 17 00:00:00 2001 From: nn-sec Date: Sat, 31 Jan 2026 21:40:48 +0900 Subject: [PATCH 04/16] make new file --- delete_sonn.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 delete_sonn.txt diff --git a/delete_sonn.txt b/delete_sonn.txt new file mode 100644 index 000000000..e69de29bb From 6bf4fe4cbc3dc9ec8a455aaf0d03707bcef07a07 Mon Sep 17 00:00:00 2001 From: nn-sec Date: Sat, 31 Jan 2026 21:42:58 +0900 Subject: [PATCH 05/16] delete file --- delete_sonn.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 delete_sonn.txt diff --git a/delete_sonn.txt b/delete_sonn.txt deleted file mode 100644 index e69de29bb..000000000 From d95fdc329d75c652d36bab7b339e2ef58ae34934 Mon Sep 17 00:00:00 2001 From: nn-sec Date: Sat, 31 Jan 2026 21:45:27 +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 49548b5a50aad2ef255a00276053f0179a2780d1 Mon Sep 17 00:00:00 2001 From: nn-sec Date: Sat, 31 Jan 2026 22:26:16 +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 9103fff1f698972ad8ef3ae02dc1bbb1c69b53a1 Mon Sep 17 00:00:00 2001 From: nn-sec Date: Sat, 31 Jan 2026 23:45:27 +0900 Subject: [PATCH 08/16] updete_readme --- READ.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 READ.md diff --git a/READ.md b/READ.md new file mode 100644 index 000000000..13e5a1597 --- /dev/null +++ b/READ.md @@ -0,0 +1 @@ +new-featureブランチで変更 \ No newline at end of file From 4dd10a34ec5cd505ea4f191664101ebb6127773e Mon Sep 17 00:00:00 2001 From: nn-sec Date: Sun, 1 Feb 2026 00:08:08 +0900 Subject: [PATCH 09/16] update readme for autmatic merge --- READ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/READ.md b/READ.md index 13e5a1597..b12433ef8 100644 --- a/READ.md +++ b/READ.md @@ -1 +1 @@ -new-featureブランチで変更 \ No newline at end of file +no-fast-forwardブランチで変更 \ No newline at end of file From 2dbe5a3d5489925f342860bbbc2145f301aba3f9 Mon Sep 17 00:00:00 2001 From: nn-sec Date: Sun, 1 Feb 2026 00:13:11 +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..14c2235f9 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +0mon OK \ No newline at end of file From e2cef1a62111b4029b014c17ca12625c834c9609 Mon Sep 17 00:00:00 2001 From: nn-sec Date: Sun, 1 Feb 2026 15:37:55 +0900 Subject: [PATCH 11/16] update readme on conflict branch for conflict --- READ.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/READ.md b/READ.md index b12433ef8..8ccfeed98 100644 --- a/READ.md +++ b/READ.md @@ -1 +1,2 @@ -no-fast-forwardブランチで変更 \ No newline at end of file +conflict +ブランチで変更 \ No newline at end of file From f39e2a1b917103742ae993dac83a492a99b34a58 Mon Sep 17 00:00:00 2001 From: nn-sec Date: Sun, 1 Feb 2026 15:44:01 +0900 Subject: [PATCH 12/16] update readme on conflict branch for conflict --- READ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/READ.md b/READ.md index b12433ef8..704cccea5 100644 --- a/READ.md +++ b/READ.md @@ -1 +1 @@ -no-fast-forwardブランチで変更 \ No newline at end of file +mainブランチで変更(コンフリクト発生) \ No newline at end of file From b7c960541b989f51d6936d7acfab6c0a20c9ab6b Mon Sep 17 00:00:00 2001 From: nn-sec Date: Sun, 1 Feb 2026 16:43:24 +0900 Subject: [PATCH 13/16] Update README.md update readme on Gitgub --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index eda4424cc..dc00958f0 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice -ローカル練習用 \ No newline at end of file +ローカル練習用 +git hub上で更新 From ce5fa2581b17b0837cfb1c771ededccddbda373d Mon Sep 17 00:00:00 2001 From: nn-sec Date: Sun, 1 Feb 2026 17:34:05 +0900 Subject: [PATCH 14/16] Update README.md update readme on github for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dc00958f0..e281ff24e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice ローカル練習用 -git hub上で更新 +git hub上で更新2回目 From d32b92fa1e86f032740007a983e32e8ef9b8e130 Mon Sep 17 00:00:00 2001 From: nn-sec Date: Sun, 1 Feb 2026 17:36:56 +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 dc00958f0..39139ac9d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice ローカル練習用 -git hub上で更新 +conflict-remoteで更新(コンフリクト発生) From 472258a35b91ab2eb7fea06a9a50e61ba3598c44 Mon Sep 17 00:00:00 2001 From: nn-sec Date: Sun, 1 Feb 2026 19:14:32 +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 59a5a84fc..688075deb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice ローカル練習用 -<<<<<<< HEAD -conflict-remoteで更新(コンフリクト発生) +自分のリポジトリで更新