From b1cee9f14d97a97038458a2bff0aa11b700df0a0 Mon Sep 17 00:00:00 2001 From: imari155304 Date: Mon, 2 Mar 2026 14:49:06 +0900 Subject: [PATCH 01/23] add newfile --- newfile.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 000000000..e69de29bb From f19847b25f441312c574d6879f754db34a95b9c8 Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sat, 14 Mar 2026 17:51:08 +0900 Subject: [PATCH 02/23] change named --- 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 3b5c10574f7f6a640b9e8fffa11c0f89aa5c37c1 Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sat, 14 Mar 2026 17:55:09 +0900 Subject: [PATCH 03/23] change name again --- README.md | 1 + namechanged.txt | 0 namechanged2.txt | 1 + 3 files changed, 2 insertions(+) delete mode 100644 namechanged.txt create mode 100644 namechanged2.txt diff --git a/README.md b/README.md index 9e7d03700..623acaed0 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． +ローカルリポで変更 diff --git a/namechanged.txt b/namechanged.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/namechanged2.txt b/namechanged2.txt new file mode 100644 index 000000000..99c7b7d92 --- /dev/null +++ b/namechanged2.txt @@ -0,0 +1 @@ +newfile作成 \ No newline at end of file From d6afd548240331d7d3bf5ba92527f6b96b2ed05d Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sat, 14 Mar 2026 18:07:13 +0900 Subject: [PATCH 04/23] make newfile --- 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 53dac922aa032d46ffe526f669117e943f88967a Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sat, 14 Mar 2026 18:09:40 +0900 Subject: [PATCH 05/23] 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 dd85f3b56c536b858cea43508033e42bc571f40c Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sat, 14 Mar 2026 18:13:28 +0900 Subject: [PATCH 06/23] add 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 2ad471fa3fb71fefb982c603a11618847c7b66da Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sat, 14 Mar 2026 18:36:07 +0900 Subject: [PATCH 07/23] all file commited --- README.md | 4 ++-- delete_soon.txt | 1 + namechanged2.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 623acaed0..7f92787d8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice -このリポジトリはGit動画講座用です． -ローカルリポで変更 +このリポジトリはGit動画講座用です。 +2026/03/14, ローカルリポで変更 diff --git a/delete_soon.txt b/delete_soon.txt index e69de29bb..7b83796ba 100644 --- a/delete_soon.txt +++ b/delete_soon.txt @@ -0,0 +1 @@ +削除されます。 \ No newline at end of file diff --git a/namechanged2.txt b/namechanged2.txt index 99c7b7d92..9b6a87add 100644 --- a/namechanged2.txt +++ b/namechanged2.txt @@ -1 +1 @@ -newfile作成 \ No newline at end of file +名前変更済み \ No newline at end of file From 04ce26dcf1afa36ffb7cf58101df19d0d0d870d8 Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sat, 14 Mar 2026 20:56:50 +0900 Subject: [PATCH 08/23] update README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7f92787d8..6ba3ec654 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です。 -2026/03/14, ローカルリポで変更 +2026/03/14, ローカルリポで変更 +2026/03/14 20:54, new-featureブランチで変更 \ No newline at end of file From 43a2c0684cc908e17d0a4f7b8687d881f18c874e Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sat, 14 Mar 2026 21:14:35 +0900 Subject: [PATCH 09/23] update README for automatic merge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ba3ec654..62b973bb0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です。 2026/03/14, ローカルリポで変更 -2026/03/14 20:54, new-featureブランチで変更 \ No newline at end of file +2026/03/14 21:13, no-fast-forwardブランチで変更 \ No newline at end of file From d55d81eb831c5f21fda878a4b3695db8168f920b Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sat, 14 Mar 2026 21:18:50 +0900 Subject: [PATCH 10/23] update make newfile 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..12bcfa88a --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created new file !! From 425118352450a0c01e1170d46f7c5156c3e42c4a Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sat, 14 Mar 2026 21:28:38 +0900 Subject: [PATCH 11/23] update README for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 62b973bb0..0637f3072 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です。 2026/03/14, ローカルリポで変更 -2026/03/14 21:13, no-fast-forwardブランチで変更 \ No newline at end of file +2026/03/14 21:27, conflictブランチで変更(コンフリクト発生) \ No newline at end of file From b8fd8d1ca471980a71ced23a1189a1822feb0e6d Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sat, 14 Mar 2026 21:30:48 +0900 Subject: [PATCH 12/23] update README on main branch for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 62b973bb0..ebcf9a3d1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です。 2026/03/14, ローカルリポで変更 -2026/03/14 21:13, no-fast-forwardブランチで変更 \ No newline at end of file +2026/03/14 21:29, mainブランチで変更(コンフリクト発生) \ No newline at end of file From 7369a899956a662cd70e7414cc2b246f03c011e6 Mon Sep 17 00:00:00 2001 From: imari155304 <151482624+imari155304@users.noreply.github.com> Date: Sun, 15 Mar 2026 12:31:21 +0900 Subject: [PATCH 13/23] Update README with new GitHub update date Removed outdated change logs and added a new update date. --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 0cf9c9a22..11ff043ec 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です。 -2026/03/14, ローカルリポで変更 -2026/03/14 21:27, conflictブランチで変更(コンフリクト発生) +2026/03/15 12:30 GitHub上で更新 From 13f61ba38dfda65a40fa5fa247cacfce483c08a5 Mon Sep 17 00:00:00 2001 From: imari155304 <151482624+imari155304@users.noreply.github.com> Date: Sun, 15 Mar 2026 12:45:37 +0900 Subject: [PATCH 14/23] Update README with additional update timestamp --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 11ff043ec..842c51c0f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice -このリポジトリはGit動画講座用です。 -2026/03/15 12:30 GitHub上で更新 +このリポジトリはGit動画講座用です。 +2026/03/15 12:30 GitHub上で更新 +2026/03/15 12:45 GitHub上で再度更新 From 0cd97448108149b8a792704f064bda7694e83bb4 Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sun, 15 Mar 2026 12:48:20 +0900 Subject: [PATCH 15/23] update README for conflict --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 11ff043ec..8dd542deb 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice -このリポジトリはGit動画講座用です。 -2026/03/15 12:30 GitHub上で更新 +このリポジトリはGit動画講座用です。 +2026/03/15 12:30 GitHub上で更新 +2026/03/15 12:46 リモートリポで更新(コンフリクト発生) \ No newline at end of file From 805aa647ea07b0601fb1256fa94f497f92c1b2af Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sun, 15 Mar 2026 12:52:17 +0900 Subject: [PATCH 16/23] update README for conflict --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8dd542deb..4d54e4d00 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # git-practice このリポジトリはGit動画講座用です。 2026/03/15 12:30 GitHub上で更新 -2026/03/15 12:46 リモートリポで更新(コンフリクト発生) \ No newline at end of file +2026/03/15 12:46 リモートリポで更新(コンフリクト発生) +aaaaa \ No newline at end of file From 716706ef8109f1207555ca9d9f239d4aa36a6b30 Mon Sep 17 00:00:00 2001 From: imari155304 <151482624+imari155304@users.noreply.github.com> Date: Sun, 15 Mar 2026 12:52:37 +0900 Subject: [PATCH 17/23] Add 'bbbb' to README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 842c51c0f..e1e8e76c4 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,4 @@ このリポジトリはGit動画講座用です。 2026/03/15 12:30 GitHub上で更新 2026/03/15 12:45 GitHub上で再度更新 +bbbb From eba8139cf77bca4c4ac6ecc11110cbc6989f3048 Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sun, 15 Mar 2026 12:52:41 +0900 Subject: [PATCH 18/23] update README for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4d54e4d00..5e9f50cc3 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です。 2026/03/15 12:30 GitHub上で更新 2026/03/15 12:46 リモートリポで更新(コンフリクト発生) -aaaaa \ No newline at end of file +aaaaa From 3b1268cbabe2eced2b6f4fb3371be844f15590b5 Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sun, 15 Mar 2026 13:13:31 +0900 Subject: [PATCH 19/23] GitHub conflict test --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f9da324fe..6f3d8522e 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,4 @@ <<<<<<< HEAD 2026/03/15 12:46 リモートリポで更新(コンフリクト発生) aaaaa +2026/0315 13:13 merge conflict test From 2c3ef95c5a168df1ad9f9d01f371944d52d2301f Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sun, 15 Mar 2026 13:16:12 +0900 Subject: [PATCH 20/23] GitHub conflict test 2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f3d8522e..0a8829ca6 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,4 @@ <<<<<<< HEAD 2026/03/15 12:46 リモートリポで更新(コンフリクト発生) aaaaa -2026/0315 13:13 merge conflict test +2026/0315 13:13 merge conflict test 2 From 30523b191a6144171d07b5122410007ff10be263 Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sun, 15 Mar 2026 13:19:12 +0900 Subject: [PATCH 21/23] GitHub conflict test 3 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0a8829ca6..442acc10d 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,5 @@ <<<<<<< HEAD 2026/03/15 12:46 リモートリポで更新(コンフリクト発生) aaaaa -2026/0315 13:13 merge conflict test 2 +2026/03/15 13:13 merge conflict test 2 +2026/03/15 13:19 merge conflict test 3 From f00e9a0923a98e942c8e205d7bc15cd978bca4cb Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sun, 15 Mar 2026 13:40:48 +0900 Subject: [PATCH 22/23] commit for new-feature branch on local repo --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 442acc10d..78487c8e2 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,4 @@ aaaaa 2026/03/15 13:13 merge conflict test 2 2026/03/15 13:19 merge conflict test 3 +2026/03/15 13:39 new-feature(ローカルリポ) で更新 From 3e8c77e45b502da41ea0c3ead4bfd916bf366c73 Mon Sep 17 00:00:00 2001 From: imari155304 Date: Sun, 15 Mar 2026 13:49:37 +0900 Subject: [PATCH 23/23] commit for new-feature-2 branch on local repo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 78487c8e2..e25009fea 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,4 @@ aaaaa 2026/03/15 13:13 merge conflict test 2 2026/03/15 13:19 merge conflict test 3 -2026/03/15 13:39 new-feature(ローカルリポ) で更新 +2026/03/15 13:49 new-feature-2(ローカルリポ) で更新