From c3feeaf50b3e012d226c12a4101bea99da7448c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=8B=E5=8D=9A?= <593174331@qq.com> Date: Fri, 10 Jul 2020 15:47:04 +0800 Subject: [PATCH 1/4] create develop branch,edit file --- testFile | 1 + 1 file changed, 1 insertion(+) diff --git a/testFile b/testFile index cf7d87c..219d158 100644 --- a/testFile +++ b/testFile @@ -1 +1,2 @@ hello,this is a new create file +This file in on develop branch From 88c4ef098c5c6c0256fbeeeb05d57c3f3d5bfb06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=8B=E5=8D=9A?= <593174331@qq.com> Date: Fri, 10 Jul 2020 15:50:00 +0800 Subject: [PATCH 2/4] create branch_local,edit file --- testFile | 1 + 1 file changed, 1 insertion(+) diff --git a/testFile b/testFile index 219d158..af8e905 100644 --- a/testFile +++ b/testFile @@ -1,2 +1,3 @@ hello,this is a new create file This file in on develop branch +This file is in develop_local branch From bb38f3dded7770fd50dadaacdc86133fc9386557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=8B=E5=8D=9A?= <593174331@qq.com> Date: Fri, 10 Jul 2020 15:54:54 +0800 Subject: [PATCH 3/4] edit 1 --- testFile | 1 + 1 file changed, 1 insertion(+) diff --git a/testFile b/testFile index af8e905..57ebd05 100644 --- a/testFile +++ b/testFile @@ -1,3 +1,4 @@ hello,this is a new create file This file in on develop branch This file is in develop_local branch +1 From d88845e4b8f532fb02331185d2892f25868e232b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=8B=E5=8D=9A?= <593174331@qq.com> Date: Fri, 10 Jul 2020 16:10:18 +0800 Subject: [PATCH 4/4] edit 2 --- testFile | 1 + 1 file changed, 1 insertion(+) diff --git a/testFile b/testFile index 57ebd05..a29e858 100644 --- a/testFile +++ b/testFile @@ -2,3 +2,4 @@ hello,this is a new create file This file in on develop branch This file is in develop_local branch 1 +2 \ No newline at end of file