From 75cb12ce6c1602ed5c99efb159e1f6c0c44b24ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <liuquanjia>
Date: Sun, 24 Jul 2022 16:14:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=8EtestCheck1=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=88=B0testCheck2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	src/test/java/com/dippy/testCheckout.md
---
 src/test/java/com/dippy/testCheckout.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 src/test/java/com/dippy/testCheckout.md

diff --git a/src/test/java/com/dippy/testCheckout.md b/src/test/java/com/dippy/testCheckout.md
new file mode 100644
index 0000000..5ede570
--- /dev/null
+++ b/src/test/java/com/dippy/testCheckout.md
@@ -0,0 +1,10 @@
+测试分支提交及合并
+
+1. 当前testCheck2  
+
+
+3.【 testCheckBy-b】 cherry-pick no push 【to testCheck1】
+
+
+4. 从testCheck1切换到testCheck2
+
-- 
Gitee


From 855ee099b86daf03552dfec7a73a43b55826f3e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <liuquanjia>
Date: Sun, 24 Jul 2022 21:47:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=9C=AC=E5=9C=B0=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E7=9A=84newForLocal=E5=88=86=E6=94=AF=E8=B7=9F=E8=BF=9C?=
 =?UTF-8?q?=E7=AB=AF=E7=9A=84=E5=88=9B=E5=BB=BA=E7=9A=84=E5=88=86=E9=92=9F?=
 =?UTF-8?q?newForRemote=E7=BB=91=E5=AE=9A=E3=80=82=E7=84=B6=E5=90=8Epush?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test/java/com/dippy/testCheckout.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/com/dippy/testCheckout.md b/src/test/java/com/dippy/testCheckout.md
index 5ede570..daf2e52 100644
--- a/src/test/java/com/dippy/testCheckout.md
+++ b/src/test/java/com/dippy/testCheckout.md
@@ -7,4 +7,5 @@
 
 
 4. 从testCheck1切换到testCheck2
+5. 本地创建的newForLocal分支跟远端的创建的分钟newForRemote绑定。然后push
 
-- 
Gitee