解决 Test.java 合并冲突

This reverts commit 6a9fe13638.

src/gitTest/Test.java

@@ -24,4 +24,23 @@ 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");
+    }
+    
+    public static void  Test_revert(){
+    	System.out.println("Test_revert");
+    }
+    
+    
+    public static void  Test_stage2(){
+    	System.out.println("Test_stage2");
+    }
+    public static void  Test_Conflict1(){
+    	System.out.println("Test_Conflict1");
+    }
 }