From f10838a045937a55f21429779a5fe5ae78a2c9cb Mon Sep 17 00:00:00 2001 From: youngyi Date: Wed, 7 Aug 2024 16:04:08 +0800 Subject: [PATCH 1/2] branch2 --- 1.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/1.txt b/1.txt index 9d07aa0..29467aa 100644 --- a/1.txt +++ b/1.txt @@ -1 +1,2 @@ -111 \ No newline at end of file +111 +branch2 \ No newline at end of file From 361c47cf7802e43af0a3b577d9725ae5c71cbc9f Mon Sep 17 00:00:00 2001 From: youngyi Date: Wed, 7 Aug 2024 16:32:35 +0800 Subject: [PATCH 2/2] Merge branch 'main' of https://bdgit.educoder.net/p29304815/gittest into branch2 # Conflicts: # 1.txt --- 1.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/1.txt b/1.txt index 29467aa..bb3e592 100644 --- a/1.txt +++ b/1.txt @@ -1,2 +1,3 @@ 111 -branch2 \ No newline at end of file +branch1 +branch2