From 02eb95d3d51c929b7b43fccaf115092dae6bc059 Mon Sep 17 00:00:00 2001 From: lisl Date: Sun, 29 Sep 2024 14:09:56 +0800 Subject: [PATCH 01/11] Test_rebase2 two --- src/gitTest/Test.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gitTest/Test.java b/src/gitTest/Test.java index e02d899..86b1605 100644 --- a/src/gitTest/Test.java +++ b/src/gitTest/Test.java @@ -20,4 +20,8 @@ public class Test { System.out.println("Test_rebase"); } + public static void Test_rebase2(){ + System.out.println("Test_rebase2"); + } + } From de799479a742a4f2eca57206a5b50ea05bf6aa74 Mon Sep 17 00:00:00 2001 From: lisl Date: Sun, 29 Sep 2024 14:45:43 +0800 Subject: [PATCH 02/11] Test_reset1 --- src/gitTest/Test.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gitTest/Test.java b/src/gitTest/Test.java index 86b1605..e4fb339 100644 --- a/src/gitTest/Test.java +++ b/src/gitTest/Test.java @@ -24,4 +24,8 @@ public class Test { System.out.println("Test_rebase2"); } + public static void Test_reset1(){ + System.out.println("Test_reset1"); + } + } From 03a31985432f153a9ed3344d63446cefeb94e54c Mon Sep 17 00:00:00 2001 From: lisl Date: Sun, 29 Sep 2024 14:56:51 +0800 Subject: [PATCH 04/11] Test_reset2 --- src/gitTest/Test.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gitTest/Test.java b/src/gitTest/Test.java index e4fb339..c1cc2bc 100644 --- a/src/gitTest/Test.java +++ b/src/gitTest/Test.java @@ -28,4 +28,8 @@ public class Test { System.out.println("Test_reset1"); } + public static void Test_reset2(){ + System.out.println("Test_reset2"); + } + } From 6a9fe13638389729c7650466df2aff177dc1af39 Mon Sep 17 00:00:00 2001 From: lisl Date: Sun, 29 Sep 2024 15:01:50 +0800 Subject: [PATCH 05/11] revert --- src/gitTest/Test.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/gitTest/Test.java b/src/gitTest/Test.java index c1cc2bc..a0c2789 100644 --- a/src/gitTest/Test.java +++ b/src/gitTest/Test.java @@ -24,10 +24,6 @@ public class Test { System.out.println("Test_rebase2"); } - public static void Test_reset1(){ - System.out.println("Test_reset1"); - } - public static void Test_reset2(){ System.out.println("Test_reset2"); } From 3cc7adacb1bc482abc6f4db90570baeb6f714c2f Mon Sep 17 00:00:00 2001 From: lisl Date: Sun, 29 Sep 2024 15:02:11 +0800 Subject: [PATCH 06/11] Test_revert --- src/gitTest/Test.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gitTest/Test.java b/src/gitTest/Test.java index a0c2789..b2bc152 100644 --- a/src/gitTest/Test.java +++ b/src/gitTest/Test.java @@ -28,4 +28,8 @@ public class Test { System.out.println("Test_reset2"); } + public static void Test_revert(){ + System.out.println("Test_revert"); + } + } From e344b2419675a1d51fecb2fbbb82e5341edf256a Mon Sep 17 00:00:00 2001 From: lisl Date: Sun, 29 Sep 2024 15:02:30 +0800 Subject: [PATCH 07/11] Revert "revert" This reverts commit 6a9fe13638389729c7650466df2aff177dc1af39. --- src/gitTest/Test.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gitTest/Test.java b/src/gitTest/Test.java index b2bc152..080db52 100644 --- a/src/gitTest/Test.java +++ b/src/gitTest/Test.java @@ -24,6 +24,10 @@ public class Test { System.out.println("Test_rebase2"); } + public static void Test_reset1(){ + System.out.println("Test_reset1"); + } + public static void Test_reset2(){ System.out.println("Test_reset2"); } From 709a2c94badc980a2cc29a7bd4f3008a299621e3 Mon Sep 17 00:00:00 2001 From: lisl Date: Sun, 29 Sep 2024 15:16:49 +0800 Subject: [PATCH 08/11] Test_stage3 --- src/gitTest/Test.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/gitTest/Test.java b/src/gitTest/Test.java index 080db52..aaea06b 100644 --- a/src/gitTest/Test.java +++ b/src/gitTest/Test.java @@ -36,4 +36,11 @@ public class Test { System.out.println("Test_revert"); } + + public static void Test_stage2(){ + System.out.println("Test_stage2"); + } + public static void Test_stage3(){ + System.out.println("Test_stage3"); + } } From 292f4eccfce080c215ece63254cd4cc93f2f1feb Mon Sep 17 00:00:00 2001 From: lisl Date: Sun, 29 Sep 2024 16:54:05 +0800 Subject: [PATCH 09/11] Test_Conflict --- src/gitTest/Test.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gitTest/Test.java b/src/gitTest/Test.java index aaea06b..e3dbf38 100644 --- a/src/gitTest/Test.java +++ b/src/gitTest/Test.java @@ -40,7 +40,7 @@ public class Test { public static void Test_stage2(){ System.out.println("Test_stage2"); } - public static void Test_stage3(){ - System.out.println("Test_stage3"); + public static void Test_Conflict(){ + System.out.println("Test_Conflict"); } } From c1882d84fa679bdc98443b46130bb09a0f3e3ba4 Mon Sep 17 00:00:00 2001 From: lisl Date: Mon, 30 Sep 2024 10:37:48 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20Test.java=20?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gitTest/Test.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gitTest/Test.java b/src/gitTest/Test.java index e3dbf38..6846c45 100644 --- a/src/gitTest/Test.java +++ b/src/gitTest/Test.java @@ -40,7 +40,7 @@ public class Test { public static void Test_stage2(){ System.out.println("Test_stage2"); } - public static void Test_Conflict(){ - System.out.println("Test_Conflict"); + public static void Test_Conflict1(){ + System.out.println("Test_Conflict1"); } } From 77b143936b94df570c819534ba969700b629de38 Mon Sep 17 00:00:00 2001 From: lisl Date: Mon, 30 Sep 2024 11:18:47 +0800 Subject: [PATCH 11/11] test pull --- src/gitTest/Test.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gitTest/Test.java b/src/gitTest/Test.java index 6846c45..3f6eeb4 100644 --- a/src/gitTest/Test.java +++ b/src/gitTest/Test.java @@ -40,7 +40,7 @@ public class Test { public static void Test_stage2(){ System.out.println("Test_stage2"); } - public static void Test_Conflict1(){ - System.out.println("Test_Conflict1"); + public static void Test_Conflict12(){ + System.out.println("Test_Conflict12"); } }