From 0f270154f9ee35a244d7f15fe8af15d2397ebc84 Mon Sep 17 00:00:00 2001 From: Zamira2689 Date: Wed, 7 Oct 2020 21:30:02 +0100 Subject: [PATCH 1/6] avenger fan here --- src/test/java/add_fie_here/AvengerInfinity.java | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/test/java/add_fie_here/AvengerInfinity.java diff --git a/src/test/java/add_fie_here/AvengerInfinity.java b/src/test/java/add_fie_here/AvengerInfinity.java new file mode 100644 index 00000000..f42dd096 --- /dev/null +++ b/src/test/java/add_fie_here/AvengerInfinity.java @@ -0,0 +1,10 @@ +package add_fie_here; + +public class AvengerInfinity { + + public static void main(String[] args) { + + //add four changes and commit with 4 seperate commit messages + + } +} From 3a56999fa39409cf07c3bd30bbef6e95c5177e53 Mon Sep 17 00:00:00 2001 From: Zamira2689 Date: Wed, 7 Oct 2020 21:30:24 +0100 Subject: [PATCH 2/6] Iron man --- src/test/java/add_fie_here/AvengerInfinity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/add_fie_here/AvengerInfinity.java b/src/test/java/add_fie_here/AvengerInfinity.java index f42dd096..9e5120e5 100644 --- a/src/test/java/add_fie_here/AvengerInfinity.java +++ b/src/test/java/add_fie_here/AvengerInfinity.java @@ -6,5 +6,6 @@ public static void main(String[] args) { //add four changes and commit with 4 seperate commit messages + // adding more about avengers } } From 2ecfe0a0f84ef3758e5ee61807e0751404986d8f Mon Sep 17 00:00:00 2001 From: Zamira2689 Date: Wed, 7 Oct 2020 21:30:47 +0100 Subject: [PATCH 3/6] adding avatar --- src/test/java/add_fie_here/AvengerInfinity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/add_fie_here/AvengerInfinity.java b/src/test/java/add_fie_here/AvengerInfinity.java index 9e5120e5..741a1f67 100644 --- a/src/test/java/add_fie_here/AvengerInfinity.java +++ b/src/test/java/add_fie_here/AvengerInfinity.java @@ -7,5 +7,7 @@ public static void main(String[] args) { //add four changes and commit with 4 seperate commit messages // adding more about avengers + + //Avatar man } } From 39cc7d9ca8a27dfb38b5eaa87e7a1c56f7e47ab5 Mon Sep 17 00:00:00 2001 From: Zamira2689 Date: Wed, 7 Oct 2020 21:31:38 +0100 Subject: [PATCH 4/6] Last change Avatar --- src/test/java/add_fie_here/AvengerInfinity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/add_fie_here/AvengerInfinity.java b/src/test/java/add_fie_here/AvengerInfinity.java index 741a1f67..31b01055 100644 --- a/src/test/java/add_fie_here/AvengerInfinity.java +++ b/src/test/java/add_fie_here/AvengerInfinity.java @@ -9,5 +9,7 @@ public static void main(String[] args) { // adding more about avengers //Avatar man + + // last changes for nebula } } From 3950f37cbc3eea426b8d15467000a03a30cf2d6d Mon Sep 17 00:00:00 2001 From: Zamira2689 Date: Tue, 13 Oct 2020 16:43:30 +0100 Subject: [PATCH 5/6] homework changes --- src/test/java/add_fie_here/AvengerInfinity.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/test/java/add_fie_here/AvengerInfinity.java b/src/test/java/add_fie_here/AvengerInfinity.java index 31b01055..d4e209c8 100644 --- a/src/test/java/add_fie_here/AvengerInfinity.java +++ b/src/test/java/add_fie_here/AvengerInfinity.java @@ -11,5 +11,20 @@ public static void main(String[] args) { //Avatar man // last changes for nebula + +//Homework : +//Create brandnew project on IntelliJ +//Enable version control +//ignore the files you need to ignore +//make initial commit and push to Github +//Add new branch locally called feature1 +//add more changes commit and push to Github +//Compare your origin/master to origin/feature1 +//Create a pull request +//now you have option to merge your origin/feature1 +//into the master +//now pull the changes into your local master branch } + + } From 8d1a505853cc9b4606c0537da930b7a3cd9708d2 Mon Sep 17 00:00:00 2001 From: Zamira2689 Date: Tue, 13 Oct 2020 16:44:37 +0100 Subject: [PATCH 6/6] more homework changes --- src/test/java/add_fie_here/AvengerInfinity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/add_fie_here/AvengerInfinity.java b/src/test/java/add_fie_here/AvengerInfinity.java index d4e209c8..30682b32 100644 --- a/src/test/java/add_fie_here/AvengerInfinity.java +++ b/src/test/java/add_fie_here/AvengerInfinity.java @@ -24,6 +24,7 @@ public static void main(String[] args) { //now you have option to merge your origin/feature1 //into the master //now pull the changes into your local master branch + //ad more changes and push to github }