From e32358e23c71fbc9dc077d22ba2215e5d4647f15 Mon Sep 17 00:00:00 2001
From: 17870919867 <17870919867@163.com>
Date: Wed, 8 Jul 2026 10:54:14 +0800
Subject: [PATCH] =?UTF-8?q?=EF=BB=BF=E5=8F=98=E5=9F=BA=E7=9A=84=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
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, 4 insertions(+)

diff --git a/GIT的概念.txt b/GIT的概念.txt
index e129177..c04951e 100644
--- a/GIT的概念.txt
+++ b/GIT的概念.txt
@@ -12,5 +12,9 @@ Git 是什么：分布式版本控制系统，用于追踪文件变化
 
 冲突test
 
+<<<<<<< HEAD
 
 主干变基修改
+=======
+这是变基测试分支的内容
+>>>>>>> d8ba707 (变基的测试)