From 5de93789a3ee62edf3970c4ca75dee48afd967fd Mon Sep 17 00:00:00 2001 From: EU3 Batch Date: Mon, 12 Oct 2020 14:22:18 +0100 Subject: [PATCH 1/6] forking and pull request --- JDBC_Project_B18.iml | 2 +- src/test/java/add_file_here/PullRequestTest.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 src/test/java/add_file_here/PullRequestTest.java diff --git a/JDBC_Project_B18.iml b/JDBC_Project_B18.iml index bbfe2208..64ada3ea 100644 --- a/JDBC_Project_B18.iml +++ b/JDBC_Project_B18.iml @@ -1,6 +1,6 @@ - + diff --git a/src/test/java/add_file_here/PullRequestTest.java b/src/test/java/add_file_here/PullRequestTest.java new file mode 100644 index 00000000..149bfece --- /dev/null +++ b/src/test/java/add_file_here/PullRequestTest.java @@ -0,0 +1,7 @@ +package add_file_here; + +public class PullRequestTest { + public static void main(String[] args) { + System.out.println("learn pull request"); + } +} From a066c547b6aac32eb4962561e9eedb4d839cb6aa Mon Sep 17 00:00:00 2001 From: EU3 Batch Date: Tue, 13 Oct 2020 19:33:25 +0100 Subject: [PATCH 2/6] sample file chnges to changes --- src/test/java/add_fie_here/SampleFile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/add_fie_here/SampleFile.java b/src/test/java/add_fie_here/SampleFile.java index 82e59b02..aa203747 100644 --- a/src/test/java/add_fie_here/SampleFile.java +++ b/src/test/java/add_fie_here/SampleFile.java @@ -9,6 +9,6 @@ public static void main(String[] args) { //we are eu3 //we are awesome //adding more chnges here so i can have more hanges - //again again and again chnges + //again again and again changes } } From adc9a5a15d269e5ed29ecb0ab9014e9bdd1213b2 Mon Sep 17 00:00:00 2001 From: EU3 Batch Date: Tue, 13 Oct 2020 20:22:20 +0100 Subject: [PATCH 3/6] Avenf-ger fan here --- src/test/java/add_fie_here/Avenger.java | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/test/java/add_fie_here/Avenger.java diff --git a/src/test/java/add_fie_here/Avenger.java b/src/test/java/add_fie_here/Avenger.java new file mode 100644 index 00000000..2204ef20 --- /dev/null +++ b/src/test/java/add_fie_here/Avenger.java @@ -0,0 +1,10 @@ +package add_fie_here; + +public class Avenger { + public static void main(String[] args) { + System.out.println("create new branch and merge into master"); + + //add four changes and commit with separete commit messages + + } +} From 6ab671b3c9ef07cd9ff9996735da190a00f05998 Mon Sep 17 00:00:00 2001 From: EU3 Batch Date: Tue, 13 Oct 2020 20:24:56 +0100 Subject: [PATCH 4/6] iron man --- src/test/java/add_fie_here/Avenger.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/add_fie_here/Avenger.java b/src/test/java/add_fie_here/Avenger.java index 2204ef20..6a5980da 100644 --- a/src/test/java/add_fie_here/Avenger.java +++ b/src/test/java/add_fie_here/Avenger.java @@ -6,5 +6,7 @@ public static void main(String[] args) { //add four changes and commit with separete commit messages + //adding more info about Avengers + } } From ac2818fb2721897c6321da26e249ac46648dab9e Mon Sep 17 00:00:00 2001 From: EU3 Batch Date: Tue, 13 Oct 2020 20:26:36 +0100 Subject: [PATCH 5/6] added hulk and thor --- src/test/java/add_fie_here/Avenger.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/add_fie_here/Avenger.java b/src/test/java/add_fie_here/Avenger.java index 6a5980da..1f1f55a3 100644 --- a/src/test/java/add_fie_here/Avenger.java +++ b/src/test/java/add_fie_here/Avenger.java @@ -8,5 +8,6 @@ public static void main(String[] args) { //adding more info about Avengers + //iron man hulk thor } } From c2927596dc5706636cd64f5b817853a958e1076f Mon Sep 17 00:00:00 2001 From: EU3 Batch Date: Tue, 13 Oct 2020 21:33:15 +0100 Subject: [PATCH 6/6] =?UTF-8?q?=C4=B1=20think=20eu3=20is=20justice=20leagu?= =?UTF-8?q?e=20fan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/add_fie_here/Avenger.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/test/java/add_fie_here/Avenger.java b/src/test/java/add_fie_here/Avenger.java index 1f1f55a3..4044ecf6 100644 --- a/src/test/java/add_fie_here/Avenger.java +++ b/src/test/java/add_fie_here/Avenger.java @@ -9,5 +9,14 @@ public static void main(String[] args) { //adding more info about Avengers //iron man hulk thor + + //looks like we dont have much avenger fan? + + //justice league fsn maybe? + //EU3 Justice league fan + + //justice league fsn maybe? + //EU3 Justice league fan + } }