From 46d101a399d039505cfca67f0b344306f7a48a65 Mon Sep 17 00:00:00 2001 From: pwfldatascientist Date: Mon, 28 Apr 2025 19:13:25 +0900 Subject: [PATCH] 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 3dbd744bf..849b11151 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -github上で更新 +conflict-remote上で更新(コンフリクト発生)