From c10ceb621effc3cda211cad61d36e13c08f9eccd Mon Sep 17 00:00:00 2001 From: Flooooooooooorian Date: Tue, 22 Nov 2022 15:14:02 +0100 Subject: [PATCH 1/4] Add FeatureA --- .gitignore | 1 + .idea/vcs.xml | 1 - git-branch-rebasing-task.iml | 5 ++++- src/FeatureA.java | 8 ++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 .gitignore create mode 100644 src/FeatureA.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6a3417b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/out/ diff --git a/.idea/vcs.xml b/.idea/vcs.xml index e74aec8..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/git-branch-rebasing-task.iml b/git-branch-rebasing-task.iml index 9a5cfce..004be91 100644 --- a/git-branch-rebasing-task.iml +++ b/git-branch-rebasing-task.iml @@ -2,7 +2,10 @@ - + + + + \ No newline at end of file diff --git a/src/FeatureA.java b/src/FeatureA.java new file mode 100644 index 0000000..8b73584 --- /dev/null +++ b/src/FeatureA.java @@ -0,0 +1,8 @@ + + +public class FeatureA{ + + public static void main(String[] args) { + System.out.println("Hallo, das ist der Code von "); + } +} From 8a48256f34d777d193f4fabdcc96a2090cb8b96a Mon Sep 17 00:00:00 2001 From: Eya-BHS Date: Tue, 16 Dec 2025 10:28:39 +0100 Subject: [PATCH 2/4] Add Main class --- Main.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Main.java diff --git a/Main.java b/Main.java new file mode 100644 index 0000000..79fae36 --- /dev/null +++ b/Main.java @@ -0,0 +1,5 @@ +public class Main { + static void main(String[] args) { + + } +} From e9fa8c5d454e6873ace779bbbf57bdd17f4c1c2e Mon Sep 17 00:00:00 2001 From: Eya-BHS Date: Tue, 16 Dec 2025 10:42:11 +0100 Subject: [PATCH 3/4] name added --- src/FeatureA.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/FeatureA.java b/src/FeatureA.java index 8b73584..6bb0472 100644 --- a/src/FeatureA.java +++ b/src/FeatureA.java @@ -2,7 +2,8 @@ public class FeatureA{ - public static void main(String[] args) { - System.out.println("Hallo, das ist der Code von "); + public static void main(String[] args) { + java.lang.Object System; + System.out.println("Hallo, das ist der Code von "); } } From b2c3261d5f0372452c153079a495cc9367d50b22 Mon Sep 17 00:00:00 2001 From: Eya-BHS Date: Tue, 16 Dec 2025 11:42:51 +0100 Subject: [PATCH 4/4] Main updated --- Main.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Main.java b/Main.java index 79fae36..79b2f36 100644 --- a/Main.java +++ b/Main.java @@ -1,5 +1,6 @@ public class Main { static void main(String[] args) { + System.out.println("Hello World!"); } }