From 4c4733dde332ac7a7a8f3b2255cea52de3e52385 Mon Sep 17 00:00:00 2001
From: 17870919867 <17870919867@163.com>
Date: Wed, 8 Jul 2026 09:30:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=B9=B2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 17870919867 <17870919867@163.com>
---
 GIT的概念.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/GIT的概念.txt b/GIT的概念.txt
index 2f3115f..7c97414 100644
--- a/GIT的概念.txt
+++ b/GIT的概念.txt
@@ -8,4 +8,6 @@ Git 是什么：分布式版本控制系统，用于追踪文件变化
 
 分支：指向某个节点的指针，用于并行开发不同功能
 
-这是feature/test分支新增的内容
\ No newline at end of file
+这是feature/test分支新增的内容
+
+冲突test主干
\ No newline at end of file