From f180c8b8ea0c80e7c07e2dc10aa8d2639b2729b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=90=E8=85=BE=20=E5=BC=A0?= Date: Tue, 15 Jul 2025 12:31:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'1.txt'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/1.txt b/1.txt index 7afe5f7..225d5fe 100644 --- a/1.txt +++ b/1.txt @@ -1,3 +1,4 @@ 主分支 1 主分支 2 远程分支 1 -主分支 3 \ No newline at end of file +主分支 3 +远程修改 冲突 \ No newline at end of file