From 2c61e4edf0952bccf8905d5f964979abb660278c Mon Sep 17 00:00:00 2001 From: iolie3 Date: Sat, 28 Jun 2025 00:08:18 +0900 Subject: [PATCH] update readme on conflict-remote --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 65acddd41..79cb8dca5 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更　　 confilctブランチで変更変更（コンフリクト発生） -github上で更新 +conflict-remote上で更新(コンフリクト発生)