From e60ba239f482475943a3112f2c7871c585372aea Mon Sep 17 00:00:00 2001 From: makky0816 Date: Fri, 31 Jul 2026 22:41:27 +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..db8c810df --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +newfile　作成 \ No newline at end of file From 4e74496e6b57958ed132380521796b1a0c7e9bb2 Mon Sep 17 00:00:00 2001 From: makky0816 Date: Sat, 1 Aug 2026 23:47:38 +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 271377e582871aa8db7e0d8909f12e18f437b30e Mon Sep 17 00:00:00 2001 From: makky0816 Date: Sat, 1 Aug 2026 23:52:52 +0900 Subject: [PATCH 03/15] changed name agein --- 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 e2b22e2a08950bab4286fee6c4c3d7d2560134be Mon Sep 17 00:00:00 2001 From: makky0816 Date: Sun, 2 Aug 2026 00:08:02 +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 f8dfe0d757e453f4acb337e2259b3adc250352c4 Mon Sep 17 00:00:00 2001 From: makky0816 Date: Sun, 2 Aug 2026 00:09:13 +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 a5422ad6e49b47d639d977dfd494b18eb0acb0e1 Mon Sep 17 00:00:00 2001 From: makky0816 Date: Sun, 2 Aug 2026 00:11:21 +0900 Subject: [PATCH 06/15] 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 b9aa8b049044e82c2cc99172e878f7d79a78266c Mon Sep 17 00:00:00 2001 From: makky0816 Date: Sun, 2 Aug 2026 00:32:27 +0900 Subject: [PATCH 07/15] 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 738736a3defad8609290436b03771789fd079937 Mon Sep 17 00:00:00 2001 From: makky0816 Date: Sun, 2 Aug 2026 11:07:39 +0900 Subject: [PATCH 08/15] 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 412f3ef7c6c78ab493b7006b496c34b009784b66 Mon Sep 17 00:00:00 2001 From: makky0816 Date: Mon, 3 Aug 2026 21:48:20 +0900 Subject: [PATCH 09/15] 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 b5655c04679d92598f4d66ebf318036e2e5f662c Mon Sep 17 00:00:00 2001 From: makky0816 Date: Mon, 3 Aug 2026 22:09:51 +0900 Subject: [PATCH 10/15] 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 75ea51dd0..26f83dbc9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -new-featureブランチで変更 \ No newline at end of file +conflictブランチで変更(conflict発生) \ No newline at end of file From b8ead803672f33eff46e16f36add89f0cad79e1a Mon Sep 17 00:00:00 2001 From: makky0816 Date: Mon, 3 Aug 2026 22:12:49 +0900 Subject: [PATCH 11/15] 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 75ea51dd0..95d012e91 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 0f6aa104680428f71db5e53d473e617804c0f8d2 Mon Sep 17 00:00:00 2001 From: makky0816 Date: Tue, 4 Aug 2026 21:40:21 +0900 Subject: [PATCH 12/15] Update README to reflect changes on GitHub --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 783801850..74b0896c9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで変更(conflict発生) +GitHub上で更新 From 6a34aa7a4410341f633d253127a21fcbecbd1b94 Mon Sep 17 00:00:00 2001 From: makky0816 Date: Tue, 4 Aug 2026 21:55:50 +0900 Subject: [PATCH 13/15] Update README to reflect second GitHub for coflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 74b0896c9..cd47895dd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -GitHub上で更新 +GitHub上で更新2回目 From f903fc0527a0182f15f4f4fb32ba8f4edd410638 Mon Sep 17 00:00:00 2001 From: makky0816 Date: Tue, 4 Aug 2026 21:59:39 +0900 Subject: [PATCH 14/15] 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 74b0896c9..fc142b3b8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -GitHub上で更新 +conflict上で更新(コンフリクト発生) From 855410445d6f89079ca28f009f5bf95f6901da71 Mon Sep 17 00:00:00 2001 From: makky0816 Date: Tue, 4 Aug 2026 22:32:37 +0900 Subject: [PATCH 15/15] update readme at my repo --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 85f71623a..e62b1a54c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -<<<<<<< HEAD -conflict上で更新(コンフリクト発生) +自分のリポジトリで更新