From 9a6a9b429cf772f51e30d4bd58c643154a13684b Mon Sep 17 00:00:00 2001 From: TK50040 Date: Tue, 30 Jun 2026 09:55:21 +0900 Subject: [PATCH 1/4] update readme in main --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9e7d03700..7d15406c3 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． +mainブランチでコンフリクト \ No newline at end of file From 48a9e369e407af1824e0f86907b7eb7f80cf737f Mon Sep 17 00:00:00 2001 From: TK50040 Date: Thu, 2 Jul 2026 10:54:10 +0900 Subject: [PATCH 2/4] Update README.md on github --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9e7d03700..52ff69d49 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． +githubで更新 From 4a055a617c95ce1fe8090aafb81fc8003ca70a4e Mon Sep 17 00:00:00 2001 From: TK50040 Date: Thu, 2 Jul 2026 10:55:52 +0900 Subject: [PATCH 3/4] update README on local --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7d15406c3..a315e0cff 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -mainブランチでコンフリクト \ No newline at end of file +ローカルで更新 \ No newline at end of file From 55cd51bdf0cadda92ac7b775a1e694325391e087 Mon Sep 17 00:00:00 2001 From: TK50040 Date: Thu, 2 Jul 2026 11:21:03 +0900 Subject: [PATCH 4/4] update readme at my repo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f59556d1c..e62b1a54c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルで更新 +自分のリポジトリで更新