From ab30ed4552434b1ae5f5a0f3795e0fcf9433319b Mon Sep 17 00:00:00 2001 From: Nathan Woodburn Date: Tue, 21 Mar 2023 13:44:10 +1100 Subject: [PATCH 1/4] gittest: Added B --- src/gittest/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gittest/Main.java b/src/gittest/Main.java index 7ad707d..08e940d 100644 --- a/src/gittest/Main.java +++ b/src/gittest/Main.java @@ -2,6 +2,6 @@ package gittest; public class Main { public static void main(String[] args) { - C c = new C(); + B b = new B(); } } From 8b7b6cb8802889a8ab9f433a92ca653d691cf853 Mon Sep 17 00:00:00 2001 From: Alice Date: Tue, 21 Mar 2023 13:44:18 +1100 Subject: [PATCH 2/4] added a (again --- src/gittest/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gittest/Main.java b/src/gittest/Main.java index 7ad707d..fe661dc 100644 --- a/src/gittest/Main.java +++ b/src/gittest/Main.java @@ -2,6 +2,6 @@ package gittest; public class Main { public static void main(String[] args) { - C c = new C(); + A a = new A(); } } From 9bf0c3ade5a574ae59b28bc4fb2f66d2a752aa76 Mon Sep 17 00:00:00 2001 From: Nathan Woodburn Date: Tue, 21 Mar 2023 13:44:58 +1100 Subject: [PATCH 3/4] Merge with both A and B --- src/gittest/Main.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gittest/Main.java b/src/gittest/Main.java index 08e940d..2fb812f 100644 --- a/src/gittest/Main.java +++ b/src/gittest/Main.java @@ -2,6 +2,7 @@ package gittest; public class Main { public static void main(String[] args) { + A a = new A(); B b = new B(); } } From 116067f42ea10a87d569c6f590843ddd9d900c40 Mon Sep 17 00:00:00 2001 From: Nathan Woodburn Date: Tue, 21 Mar 2023 13:45:39 +1100 Subject: [PATCH 4/4] removed second A --- src/gittest/Main.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/gittest/Main.java b/src/gittest/Main.java index 268b44f..2fb812f 100644 --- a/src/gittest/Main.java +++ b/src/gittest/Main.java @@ -2,7 +2,6 @@ package gittest; public class Main { public static void main(String[] args) { - A a = new A(); A a = new A(); B b = new B(); }