From aaa8d965837d4c8556346814e35c30076ddc6c11 Mon Sep 17 00:00:00 2001
From: 17870919867 <17870919867@163.com>
Date: Fri, 17 Jul 2026 13:16:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GIT的概念.txt | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/GIT的概念.txt b/GIT的概念.txt
index a83bace..429bf81 100644
--- a/GIT的概念.txt
+++ b/GIT的概念.txt
@@ -12,11 +12,8 @@ Git 是什么：分布式版本控制系统，用于追踪文件变化
 
 冲突test
 
-<<<<<<< HEAD
 
-主干变基修改
-=======
-这是变基测试分支的内容
->>>>>>> d8ba707 (变基的测试)
+第一种补丁应用测试第二次尝试
 
-第二种补丁应用测试第二次尝试
\ No newline at end of file
+
+加点东西
\ No newline at end of file