emverdes · jonathanbalino · Jul 30, 2025 · Jul 30, 2025 · Jul 30, 2025 · Jul 30, 2025
diff --git a/Alice.txt b/Alice.txt
diff --git a/Jonathan.txt b/Jonathan.txt
@@ -0,0 +1,12 @@
+Prueba Jonathan
+
+Nuevo texto
+
+Commit without -m
+
+<<<<<<< HEAD
+
+test
+=======
+from branch jorge
+>>>>>>> jorge
diff --git a/Jorge.txt b/Jorge.txt
@@ -0,0 +1 @@
+Agrego el archivo Jorge al branch Jorge
diff --git a/Pedro.txt b/Pedro.txt
@@ -0,0 +1,7 @@
+<<<<<<< HEAD
+Pedro
+
+Edito aca abajo en master 
+=======
+Pedro edito esta linea en branch Jorge 
+>>>>>>> jorge