From 44abaa8da882910d438f2c83ea45d7b0f931755e Mon Sep 17 00:00:00 2001 From: fengwenjian Date: Wed, 15 Jan 2025 10:08:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=9C=A8dev=E5=88=86=E6=94=AF=E4=B8=AD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- a.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/a.txt b/a.txt index d55c616..abf49f0 100644 --- a/a.txt +++ b/a.txt @@ -3,3 +3,4 @@ add one 这是在master分支上面增加的内容，添加在了a.txt的第二行中。 这是在master分支上面增加的内容，添加在了a.txt的第三行中。 手动做了merge操作，将dev和master分支做和合并操作，上面所合并后端结果。 +add by dev branch From 16d76c1c88fc819f496ee971528e18fce3c87f9e Mon Sep 17 00:00:00 2001 From: fengwenjian Date: Wed, 15 Jan 2025 16:19:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=A0=E9=99=A4b.txt=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9a.txt=EF=BC=8C=E6=96=B0=E5=A2=9Ec.txt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- a.txt | 1 + b.txt | 3 --- c.txt | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 b.txt create mode 100644 c.txt diff --git a/a.txt b/a.txt index abf49f0..22be2c5 100644 --- a/a.txt +++ b/a.txt @@ -1,3 +1,4 @@ +dddddd add one 添加a.txt文件之后，在dev分支又修改了改文件，增加了这一样。 这是在master分支上面增加的内容，添加在了a.txt的第二行中。 diff --git a/b.txt b/b.txt deleted file mode 100644 index cd76278..0000000 --- a/b.txt +++ /dev/null @@ -1,3 +0,0 @@ -this is b.txt - -又增加了一行 diff --git a/c.txt b/c.txt new file mode 100644 index 0000000..3ef06a8 --- /dev/null +++ b/c.txt @@ -0,0 +1,2 @@ +aaaa + From 2f07d1dbb03c7dcbc264826b65b1074ed8c424c3 Mon Sep 17 00:00:00 2001 From: fengwenjian Date: Wed, 15 Jan 2025 17:02:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?xiugai=20a.txt=20=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- a.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/a.txt b/a.txt index 22be2c5..b1834f2 100644 --- a/a.txt +++ b/a.txt @@ -1,7 +1,7 @@ dddddd add one -添加a.txt文件之后，在dev分支又修改了改文件，增加了这一样。 -这是在master分支上面增加的内容，添加在了a.txt的第二行中。 +添加a.txt文件之后，xxxfffdddd在dev分支又修改了改文件，增加了这一样。 这是在master分支上面增加的内容，添加在了a.txt的第三行中。 手动做了merge操作，将dev和master分支做和合并操作，上面所合并后端结果。 add by dev branch +哈哈哈哈哈 From 5ba298229e72dd67ec5eee6ebb915d2b53484285 Mon Sep 17 00:00:00 2001 From: fengwenjian Date: Wed, 15 Jan 2025 17:05:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?dev=E5=88=86=E6=94=AF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=86c.txt=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=863=E8=A1=8C?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- c.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/c.txt b/c.txt index 3ef06a8..e74329b 100644 --- a/c.txt +++ b/c.txt @@ -1,2 +1,5 @@ +aa +dd +bb aaaa