From f5a74fc790b772bfa241c464f2f94cc3b5bcfb17 Mon Sep 17 00:00:00 2001
From: Luoyuanyuan <2306543568@qq.com>
Date: Wed, 7 Aug 2024 15:49:57 +0800
Subject: [PATCH 1/5] =?UTF-8?q?branch2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hello.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hello.txt b/hello.txt
index d245b3c..dfc1d88 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,2 +1,4 @@
 hello lyy
-hello222
\ No newline at end of file
+hello222
+
+branch2修改
-- 
2.34.1


From 3319d3cdf94fd16613aceff3671c40087239ad29 Mon Sep 17 00:00:00 2001
From: Luoyuanyuan <2306543568@qq.com>
Date: Thu, 8 Aug 2024 11:53:19 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9branch2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hello.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/hello.txt b/hello.txt
index 87949fa..bd5591c 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,9 +1,4 @@
 hello lyy
 hello222
 
-<<<<<<< HEAD
-branch2修改
-branch2修改
-=======
-branch1修改
->>>>>>> 4fb1465acd7b72ac470ae8307e4fbef0bf88df10
+新增branch2
-- 
2.34.1


From fc762bf06ffa5b3e48c4006d578952573d1106cd Mon Sep 17 00:00:00 2001
From: Luoyuanyuan <2306543568@qq.com>
Date: Thu, 8 Aug 2024 11:53:19 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9branch2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hello.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/hello.txt b/hello.txt
index 87949fa..bd5591c 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,9 +1,4 @@
 hello lyy
 hello222
 
-<<<<<<< HEAD
-branch2修改
-branch2修改
-=======
-branch1修改
->>>>>>> 4fb1465acd7b72ac470ae8307e4fbef0bf88df10
+新增branch2
-- 
2.34.1


From 22a0ddc20ee648311bf21b0ac6776dfa3945fdfc Mon Sep 17 00:00:00 2001
From: Luoyuanyuan <2306543568@qq.com>
Date: Thu, 8 Aug 2024 11:57:41 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9branch2=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?hello.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hello.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hello.txt b/hello.txt
index bd5591c..c154dd5 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,4 +1,5 @@
 hello lyy
 hello222
 
-新增branch2
+新增branch2加星*******
+
-- 
2.34.1


From f6af7125a571c2f8cc2320de6ef72e0a36105c8a Mon Sep 17 00:00:00 2001
From: Luoyuanyuan <2306543568@qq.com>
Date: Thu, 8 Aug 2024 11:59:57 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9branch2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hello.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hello.txt b/hello.txt
index c154dd5..988f681 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,5 +1,4 @@
 hello lyy
 hello222
 
-新增branch2加星*******
-
+新增branch2且加****
\ No newline at end of file
-- 
2.34.1