From e3f47a286471d29e248e8cdcdd000205f9e72bc5 Mon Sep 17 00:00:00 2001 From: Nada Date: Wed, 25 Jan 2023 11:45:32 -0500 Subject: [PATCH 1/6] new file saved --- newfile.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newfile.java diff --git a/newfile.java b/newfile.java new file mode 100644 index 00000000..e69de29b From 9158c4c1884fe3ba99f1ee60dbd2cc33d5b23420 Mon Sep 17 00:00:00 2001 From: Nada Date: Wed, 25 Jan 2023 11:48:17 -0500 Subject: [PATCH 2/6] added text --- newfile.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/newfile.java b/newfile.java index e69de29b..81c4e780 100644 --- a/newfile.java +++ b/newfile.java @@ -0,0 +1,5 @@ +public class newfile{ + public static void main(String[] args){ + System.out.println("Hello World!"); + } + } \ No newline at end of file From 17d9b86ff6e2db9a9ca22fa4d42117f47749c0cf Mon Sep 17 00:00:00 2001 From: Nada Date: Wed, 25 Jan 2023 11:58:56 -0500 Subject: [PATCH 3/6] to new branch --- newfile.java | 1 + 1 file changed, 1 insertion(+) diff --git a/newfile.java b/newfile.java index 81c4e780..071c959f 100644 --- a/newfile.java +++ b/newfile.java @@ -1,5 +1,6 @@ public class newfile{ public static void main(String[] args){ System.out.println("Hello World!"); + System.out.println("adding to new branch"); } } \ No newline at end of file From ac9f6eb337810fdc45e81c9a82df7b1dbb0823ab Mon Sep 17 00:00:00 2001 From: Nada Date: Wed, 25 Jan 2023 12:11:38 -0500 Subject: [PATCH 4/6] error hopefully --- newfile.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/newfile.java b/newfile.java index 071c959f..2118ff3f 100644 --- a/newfile.java +++ b/newfile.java @@ -2,5 +2,7 @@ public class newfile{ public static void main(String[] args){ System.out.println("Hello World!"); System.out.println("adding to new branch"); + System.out.println("trying to get a conflict"); + } } \ No newline at end of file From 02117d2f554d6636bb9d8fccc762db835f93134d Mon Sep 17 00:00:00 2001 From: Nada Date: Thu, 26 Jan 2023 16:58:55 -0500 Subject: [PATCH 5/6] trying to get error --- newfile.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/newfile.java b/newfile.java index 2118ff3f..3b087d1f 100644 --- a/newfile.java +++ b/newfile.java @@ -1,8 +1,7 @@ public class newfile{ public static void main(String[] args){ System.out.println("Hello World!"); - System.out.println("adding to new branch"); - System.out.println("trying to get a conflict"); + System.out.println("attempting for an error"); } } \ No newline at end of file From f4f74c86ba9765211143295695f4bbdf7a778a61 Mon Sep 17 00:00:00 2001 From: Nada Date: Thu, 26 Jan 2023 17:00:31 -0500 Subject: [PATCH 6/6] changed line --- newfile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newfile.java b/newfile.java index 071c959f..91b1daaf 100644 --- a/newfile.java +++ b/newfile.java @@ -1,6 +1,6 @@ public class newfile{ public static void main(String[] args){ System.out.println("Hello World!"); - System.out.println("adding to new branch"); + System.out.println("now with different text"); } } \ No newline at end of file