From 8a0a2a9b4b1c0e2bf0382ef2ee48bf0fe9088e89 Mon Sep 17 00:00:00 2001 From: Annonymus Date: Sat, 6 Nov 2021 07:56:11 +0100 Subject: [PATCH 1/9] add MarcoTereh.java --- MarcoTereh.java | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 MarcoTereh.java diff --git a/MarcoTereh.java b/MarcoTereh.java new file mode 100644 index 0000000..a4e7fad --- /dev/null +++ b/MarcoTereh.java @@ -0,0 +1,3 @@ +public class MarcoTereh { + +} From 1bfae35eae43448e51b492361e57120b9f45d87a Mon Sep 17 00:00:00 2001 From: Annonymus Date: Sat, 6 Nov 2021 07:57:32 +0100 Subject: [PATCH 2/9] add method foo to my class --- MarcoTereh.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MarcoTereh.java b/MarcoTereh.java index a4e7fad..035cad0 100644 --- a/MarcoTereh.java +++ b/MarcoTereh.java @@ -1,3 +1,5 @@ public class MarcoTereh { - + public void foo() { + + } } From b4aeaa78f4cd4b65838af848d5837eb881d2578d Mon Sep 17 00:00:00 2001 From: Annonymus Date: Sat, 6 Nov 2021 07:59:41 +0100 Subject: [PATCH 3/9] refactor MyClass to use clearly superior naming conventions --- MyClass.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MyClass.java b/MyClass.java index 2d01701..736555d 100644 --- a/MyClass.java +++ b/MyClass.java @@ -1,8 +1,8 @@ public class MyClass { - + public String niceMethod() { - String nice = "giovanni & ali"; - return nice; + String Tereh = "giovanni & ali"; + return Tereh; } - + } From 36d805b576f9c32c99de4e17e36e4bb23b8ee0e8 Mon Sep 17 00:00:00 2001 From: Joseph Romeo Date: Sat, 6 Nov 2021 09:55:24 +0100 Subject: [PATCH 4/9] Added JoeRomeo class --- JoeRomeo.java | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 JoeRomeo.java diff --git a/JoeRomeo.java b/JoeRomeo.java new file mode 100644 index 0000000..bd5926e --- /dev/null +++ b/JoeRomeo.java @@ -0,0 +1,2 @@ +public class JoeRomeo { +} From 7212dff9e26ef20befa9959068687732e3cb9fe1 Mon Sep 17 00:00:00 2001 From: Joseph Romeo Date: Sat, 6 Nov 2021 09:56:10 +0100 Subject: [PATCH 5/9] Added awesome method to Joe Romeo class --- JoeRomeo.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/JoeRomeo.java b/JoeRomeo.java index bd5926e..b653635 100644 --- a/JoeRomeo.java +++ b/JoeRomeo.java @@ -1,2 +1,7 @@ public class JoeRomeo { + public void AwesomeMethod() { + int awesomeThings = 42; + + return awesomeThings; + } } From 841bb4a516911a131ba92b31c54db89a1ebc687f Mon Sep 17 00:00:00 2001 From: Joseph Romeo Date: Sat, 6 Nov 2021 09:57:26 +0100 Subject: [PATCH 6/9] Added joe to myclass --- MyClass.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MyClass.java b/MyClass.java index 736555d..58b045f 100644 --- a/MyClass.java +++ b/MyClass.java @@ -1,8 +1,8 @@ public class MyClass { public String niceMethod() { - String Tereh = "giovanni & ali"; - return Tereh; + String Joe = "joe"; + return Joe; } } From 7bf1c8f0fad499e4245a9632878b69c1056ce5c6 Mon Sep 17 00:00:00 2001 From: deepansha16 Date: Sat, 6 Nov 2021 16:09:35 +0100 Subject: [PATCH 7/9] added empty class --- DeepanshaChowdhary.java | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 DeepanshaChowdhary.java diff --git a/DeepanshaChowdhary.java b/DeepanshaChowdhary.java new file mode 100644 index 0000000..c90b1ae --- /dev/null +++ b/DeepanshaChowdhary.java @@ -0,0 +1,3 @@ +public class DeepanshaChowdhary{ + int x = 5; +} \ No newline at end of file From 2dcca051150b7418fae47dcd5976b012e2288968 Mon Sep 17 00:00:00 2001 From: deepansha16 Date: Sat, 6 Nov 2021 16:50:00 +0100 Subject: [PATCH 8/9] added randomMethod --- DeepanshaChowdhary.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/DeepanshaChowdhary.java b/DeepanshaChowdhary.java index c90b1ae..5b793d5 100644 --- a/DeepanshaChowdhary.java +++ b/DeepanshaChowdhary.java @@ -1,3 +1,9 @@ -public class DeepanshaChowdhary{ - int x = 5; -} \ No newline at end of file +public class DeepanshaChowdhary { + static void randomMethod() { + System.out.println("random text"); + } + public static void main(String[] args) { + randomMethod(); + + } +} From 66c4fb4b3fe23fd28982a8f6e41c88ea2ea71129 Mon Sep 17 00:00:00 2001 From: Annonymus <13857960+Annonymus-v02@users.noreply.github.com> Date: Wed, 10 Nov 2021 20:04:20 +0100 Subject: [PATCH 9/9] manually clone changes from upstream because github won't let me resolve conflicts from browser and I'm too lazy to clone and resolve on my own machine --- MyClass.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MyClass.java b/MyClass.java index 58b045f..c497691 100644 --- a/MyClass.java +++ b/MyClass.java @@ -1,7 +1,7 @@ public class MyClass { public String niceMethod() { - String Joe = "joe"; + String Joe = "we are updating this string at the moment but, if you experience any conflict, please do not hesitate to modify it to set the value that you have chosen"; return Joe; }