From 624f6661465e50e0982f125dc941ca66b0c2bf56 Mon Sep 17 00:00:00 2001
From: DogPo <35034410+DogPo@users.noreply.github.com>
Date: Mon, 22 Dec 2025 21:42:53 +0800
Subject: [PATCH 01/10] Add test file with sample content

---
 test | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 test

diff --git a/test b/test
new file mode 100644
index 00000000..ddc2a5f9
--- /dev/null
+++ b/test
@@ -0,0 +1 @@
+这是一个测试文件

From 3d26b69d7c577358abe3e62d5823b0d33fcbbb54 Mon Sep 17 00:00:00 2001
From: DogPo <35034410+DogPo@users.noreply.github.com>
Date: Mon, 22 Dec 2025 22:45:07 +0800
Subject: [PATCH 02/10] Add test2 file with initial content

---
 test2 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 test2

diff --git a/test2 b/test2
new file mode 100644
index 00000000..152c38e5
--- /dev/null
+++ b/test2
@@ -0,0 +1 @@
+test again

From d3d69d2d2139fdf37cc7965383a3eddc10c418dd Mon Sep 17 00:00:00 2001
From: DogPo <35034410+DogPo@users.noreply.github.com>
Date: Tue, 23 Dec 2025 21:01:56 +0800
Subject: [PATCH 03/10] Delete test

---
 test | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 test

diff --git a/test b/test
deleted file mode 100644
index ddc2a5f9..00000000
--- a/test
+++ /dev/null
@@ -1 +0,0 @@
-这是一个测试文件

From 63890e0dc3788ec5f1f7c8e62c036c7c5339d7d3 Mon Sep 17 00:00:00 2001
From: DogPo <35034410+DogPo@users.noreply.github.com>
Date: Tue, 23 Dec 2025 21:02:20 +0800
Subject: [PATCH 04/10] Delete test2

---
 test2 | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 test2

diff --git a/test2 b/test2
deleted file mode 100644
index 152c38e5..00000000
--- a/test2
+++ /dev/null
@@ -1 +0,0 @@
-test again

From e32037db6abe2302848aae2cc1522fb82214f1f7 Mon Sep 17 00:00:00 2001
From: DogPo <35034410+DogPo@users.noreply.github.com>
Date: Tue, 23 Dec 2025 21:16:14 +0800
Subject: [PATCH 05/10] Add Chinese text to README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index efebf033..d661c7b4 100644
--- a/README.md
+++ b/README.md
@@ -7,3 +7,7 @@ How to Contribute
 =================
 
 Just fork the original repo at pragmaticlearning/github-example, make your changes and send over a Pull Request.
+
+这是一个md文件
+==============
+这是一个md文件

From a568a633e6484204a10f1a682c2036475230dc5c Mon Sep 17 00:00:00 2001
From: DogPo <35034410+DogPo@users.noreply.github.com>
Date: Tue, 23 Dec 2025 21:39:28 +0800
Subject: [PATCH 06/10] Create new_file2.md

---
 new_file.md => new_file2.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename new_file.md => new_file2.md (100%)

diff --git a/new_file.md b/new_file2.md
similarity index 100%
rename from new_file.md
rename to new_file2.md

From 7821d9fd585622cac2d9e93de8ecc8c2c24d6ce2 Mon Sep 17 00:00:00 2001
From: DogPo <35034410+DogPo@users.noreply.github.com>
Date: Tue, 23 Dec 2025 21:43:01 +0800
Subject: [PATCH 07/10] Rename new_file2.md to test/new_file2.md

---
 new_file2.md => test/new_file2.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename new_file2.md => test/new_file2.md (100%)

diff --git a/new_file2.md b/test/new_file2.md
similarity index 100%
rename from new_file2.md
rename to test/new_file2.md

From 73c1d571cab494bda828ce4c8f4625644d01a654 Mon Sep 17 00:00:00 2001
From: DogPo <35034410+DogPo@users.noreply.github.com>
Date: Tue, 23 Dec 2025 21:52:04 +0800
Subject: [PATCH 08/10] Rename new_file2.md to new_file2.md2

---
 test/{new_file2.md => new_file2.md2} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/{new_file2.md => new_file2.md2} (100%)

diff --git a/test/new_file2.md b/test/new_file2.md2
similarity index 100%
rename from test/new_file2.md
rename to test/new_file2.md2

From 8c46973ee08aeeac721c906c3296d7b85736fe7e Mon Sep 17 00:00:00 2001
From: DogPo <35034410+DogPo@users.noreply.github.com>
Date: Tue, 23 Dec 2025 22:07:37 +0800
Subject: [PATCH 09/10] Create .gitkeep

---
 build/.gitkeep | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/.gitkeep

diff --git a/build/.gitkeep b/build/.gitkeep
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/build/.gitkeep
@@ -0,0 +1 @@
+

From d387922c34992450ced457526cf3c12a39105035 Mon Sep 17 00:00:00 2001
From: DogPo <35034410+DogPo@users.noreply.github.com>
Date: Mon, 29 Dec 2025 22:03:52 +0800
Subject: [PATCH 10/10] Add merge test file

---
 "\345\220\210\345\271\266\346\265\213\350\257\225" | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 "\345\220\210\345\271\266\346\265\213\350\257\225"

diff --git "a/\345\220\210\345\271\266\346\265\213\350\257\225" "b/\345\220\210\345\271\266\346\265\213\350\257\225"
new file mode 100644
index 00000000..42a75ed5
--- /dev/null
+++ "b/\345\220\210\345\271\266\346\265\213\350\257\225"
@@ -0,0 +1 @@
+这是一个合并测试文件