From e8c764653a4db95b2fd50210325801a4d9a6317c Mon Sep 17 00:00:00 2001
From: 17870919867 <17870919867@163.com>
Date: Fri, 17 Jul 2026 09:47:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E7=A7=8D=E8=A1=A5=E4=B8=81?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GIT的概念.txt |  6 ++++++
 patch.diff       | 12 ++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 patch.diff

diff --git a/GIT的概念.txt b/GIT的概念.txt
index e129177..a83bace 100644
--- a/GIT的概念.txt
+++ b/GIT的概念.txt
@@ -12,5 +12,11 @@ Git 是什么：分布式版本控制系统，用于追踪文件变化
 
 冲突test
 
+<<<<<<< HEAD
 
 主干变基修改
+=======
+这是变基测试分支的内容
+>>>>>>> d8ba707 (变基的测试)
+
+第二种补丁应用测试第二次尝试
\ No newline at end of file
diff --git a/patch.diff b/patch.diff
new file mode 100644
index 0000000..5f29652
--- /dev/null
+++ b/patch.diff
@@ -0,0 +1,12 @@
+diff --git a/GIT的概念.txt b/GIT的概念.txt
+index f9f9a94..a83bace 100644
+--- a/GIT的概念.txt
++++ b/GIT的概念.txt
+@@ -19,4 +19,4 @@ Git 是什么：分布式版本控制系统，用于追踪文件变化
+ 这是变基测试分支的内容
+ >>>>>>> d8ba707 (变基的测试)
+ 
+-第二种补丁应用测试
+\ No newline at end of file
++第二种补丁应用测试第二次尝试
+\ No newline at end of file