From 1f43d48f35ed99227dd97d25b1aa2843ac0cf33b Mon Sep 17 00:00:00 2001 From: fkhonjoosh Date: Sat, 25 Dec 2021 17:19:40 +0100 Subject: [PATCH 1/6] First commit --- HelloWorld/src/programm.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 HelloWorld/src/programm.java diff --git a/HelloWorld/src/programm.java b/HelloWorld/src/programm.java new file mode 100644 index 0000000..a72d77d --- /dev/null +++ b/HelloWorld/src/programm.java @@ -0,0 +1,12 @@ +public class Program { + + public static void main(String[] args) { + + for (int i=1; i<=10; i++) { + // first change + System.out.println("Hallo World ..."+i); + System.out.println("Hallo World ..."+i); + + } + + } \ No newline at end of file From 0da569d2ca9d13326a75fe8e835ef22f8b04b20c Mon Sep 17 00:00:00 2001 From: fkhonjoosh Date: Sat, 25 Dec 2021 17:29:47 +0100 Subject: [PATCH 2/6] second commit --- HelloWorld/src/programm.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/HelloWorld/src/programm.java b/HelloWorld/src/programm.java index a72d77d..8d6c385 100644 --- a/HelloWorld/src/programm.java +++ b/HelloWorld/src/programm.java @@ -3,8 +3,7 @@ public class Program { public static void main(String[] args) { for (int i=1; i<=10; i++) { - // first change - System.out.println("Hallo World ..."+i); + System.out.println("Hallo World ..."+i); } From c5a114fbcac7866402db9b1b99ecb0a91094cfcf Mon Sep 17 00:00:00 2001 From: fkhonjoosh Date: Sat, 25 Dec 2021 17:37:45 +0100 Subject: [PATCH 3/6] 3. commit --- HelloWorld/src/programm.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HelloWorld/src/programm.java b/HelloWorld/src/programm.java index 8d6c385..dfd526a 100644 --- a/HelloWorld/src/programm.java +++ b/HelloWorld/src/programm.java @@ -3,7 +3,7 @@ public class Program { public static void main(String[] args) { for (int i=1; i<=10; i++) { - + // change for 3. commit System.out.println("Hallo World ..."+i); } From 378dd43e7bbe9b112cc550dc0e6ec6c29a814e3b Mon Sep 17 00:00:00 2001 From: fkhonjoosh Date: Sat, 25 Dec 2021 17:44:04 +0100 Subject: [PATCH 4/6] FeatureA commit --- HelloWorld/src/programm.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/HelloWorld/src/programm.java b/HelloWorld/src/programm.java index dfd526a..54e9504 100644 --- a/HelloWorld/src/programm.java +++ b/HelloWorld/src/programm.java @@ -3,7 +3,8 @@ public class Program { public static void main(String[] args) { for (int i=1; i<=10; i++) { - // change for 3. commit + // Branche featureA + System.out.println("Hallo World ..."); System.out.println("Hallo World ..."+i); } From bb0d3049734219bb042918c2b4996b8727f737f0 Mon Sep 17 00:00:00 2001 From: fkhonjoosh Date: Sun, 26 Dec 2021 11:09:48 +0100 Subject: [PATCH 5/6] second commit in Branch FeatureA --- HelloWorld/src/programm.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/HelloWorld/src/programm.java b/HelloWorld/src/programm.java index 54e9504..3baf83f 100644 --- a/HelloWorld/src/programm.java +++ b/HelloWorld/src/programm.java @@ -4,9 +4,11 @@ public static void main(String[] args) { for (int i=1; i<=10; i++) { // Branche featureA - System.out.println("Hallo World ..."); + System.out.println("Hallo World ..."); + // Branche featureA next commit System.out.println("Hallo World ..."+i); - + // New comment + System.out.println("Hallo FeatureA ..."+i); } } \ No newline at end of file From 7aeecf5ab17bf27be8ff47d5447184b04ee35335 Mon Sep 17 00:00:00 2001 From: fkhonjoosh Date: Sun, 26 Dec 2021 11:22:56 +0100 Subject: [PATCH 6/6] 4. commit in main Brance --- HelloWorld/src/programm.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HelloWorld/src/programm.java b/HelloWorld/src/programm.java index dfd526a..81c08b3 100644 --- a/HelloWorld/src/programm.java +++ b/HelloWorld/src/programm.java @@ -5,6 +5,8 @@ public static void main(String[] args) { for (int i=1; i<=10; i++) { // change for 3. commit System.out.println("Hallo World ..."+i); + // change for 4. commit + System.out.println("Hallo 4. World ..."+i); }