From 39695fbf6ab7608ac1ed167f4a09c99da91d06e5 Mon Sep 17 00:00:00 2001 From: iakovsidorov Date: Wed, 19 Aug 2020 15:23:38 +0300 Subject: [PATCH 1/3] johns changes --- src/main/java/JohnsClass.java | 2 ++ src/main/java/Main.java | 1 + 2 files changed, 3 insertions(+) create mode 100644 src/main/java/JohnsClass.java diff --git a/src/main/java/JohnsClass.java b/src/main/java/JohnsClass.java new file mode 100644 index 0000000..9c8ae54 --- /dev/null +++ b/src/main/java/JohnsClass.java @@ -0,0 +1,2 @@ +public class JohnsClass { +} diff --git a/src/main/java/Main.java b/src/main/java/Main.java index abc102b..cbf4ef4 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,5 +1,6 @@ public class Main { public static void main(String[] args) { System.out.println("This is Master branch in initial state"); + System.out.println("John added something valuable"); } } From 4b2e160e891bd424a4b05bfb145e1cb313f12e06 Mon Sep 17 00:00:00 2001 From: iakovsidorov Date: Wed, 19 Aug 2020 15:26:55 +0300 Subject: [PATCH 2/3] daves changes --- src/main/java/DavesClass.java | 3 +++ src/main/java/Main.java | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 src/main/java/DavesClass.java diff --git a/src/main/java/DavesClass.java b/src/main/java/DavesClass.java new file mode 100644 index 0000000..fc07023 --- /dev/null +++ b/src/main/java/DavesClass.java @@ -0,0 +1,3 @@ +public class DavesClass { + static final String MESSAGE = "Here are the changes Dave made"; +} \ No newline at end of file diff --git a/src/main/java/Main.java b/src/main/java/Main.java index abc102b..b24948c 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,5 +1,7 @@ public class Main { public static void main(String[] args) { - System.out.println("This is Master branch in initial state"); + System.out.println("This is Dave's branch"); + System.out.println("Dave did some good job here"); + System.out.println("Master branch state changed substantially"); } -} +} \ No newline at end of file From 647a24994576b0070f5cdb7f5283403886dedabc Mon Sep 17 00:00:00 2001 From: iakovsidorov Date: Wed, 19 Aug 2020 15:50:30 +0300 Subject: [PATCH 3/3] typo --- src/main/java/DavesClass.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/DavesClass.java b/src/main/java/DavesClass.java index fc07023..6fe17dc 100644 --- a/src/main/java/DavesClass.java +++ b/src/main/java/DavesClass.java @@ -1,3 +1,3 @@ public class DavesClass { static final String MESSAGE = "Here are the changes Dave made"; -} \ No newline at end of file +}