解决 Test.java 合并冲突

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");
     }
 }