java.java

# Conflicts:
#	branch1.txt

branch1.txt

@@ -0,0 +1,8 @@
+branch1
+<<<<<<< HEAD
+master1
+=======
+第二次修改branch1
+>>>>>>> branch1
+
+第三次修改

java.java

@@ -0,0 +1,5 @@
+public class HelloWorld {
+    public static void main(String[] args) {
+        System.out.println("Hello, World!");
+    }
+}

test.py

@@ -0,0 +1,2 @@
+print('Hellow world！')
+print('Hellow git！')