From 419a3192d43cca3aaf5a1a279fe1cdf7b3a6550f Mon Sep 17 00:00:00 2001 From: lolo9709 Date: Fri, 4 Oct 2024 12:21:44 +1000 Subject: [PATCH 1/4] Create test_merge_1.txt test --- test/test_merge_1.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 test/test_merge_1.txt diff --git a/test/test_merge_1.txt b/test/test_merge_1.txt new file mode 100644 index 000000000..d1fffa483 --- /dev/null +++ b/test/test_merge_1.txt @@ -0,0 +1,6 @@ +to test process: +1. go to main +2. fetch origin +3. pull origin +4. go to branch +5. merge into current branch From 3eadc3bf71b401d5b6847acf5ec2c1157dee6e3d Mon Sep 17 00:00:00 2001 From: lolo9709 Date: Fri, 4 Oct 2024 12:23:46 +1000 Subject: [PATCH 2/4] Create test_merge_2.txt --- test/test_merge_2.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/test_merge_2.txt diff --git a/test/test_merge_2.txt b/test/test_merge_2.txt new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/test/test_merge_2.txt @@ -0,0 +1 @@ + From c64e45dd0bef7b5e047e172dc42d73c87cec8868 Mon Sep 17 00:00:00 2001 From: lolo9709 Date: Fri, 4 Oct 2024 12:29:11 +1000 Subject: [PATCH 3/4] Create test_merge_3.txt --- test/test_merge_3.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/test_merge_3.txt diff --git a/test/test_merge_3.txt b/test/test_merge_3.txt new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/test/test_merge_3.txt @@ -0,0 +1 @@ + From 14748d1eeba3f0005f6167317327747f10a2bfc6 Mon Sep 17 00:00:00 2001 From: lolo9709 Date: Fri, 4 Oct 2024 12:36:57 +1000 Subject: [PATCH 4/4] Create test_merge_4.txt --- test/test_merge_4.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/test_merge_4.txt diff --git a/test/test_merge_4.txt b/test/test_merge_4.txt new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/test/test_merge_4.txt @@ -0,0 +1 @@ +