From 4e15cc73bce82ec1cf7c46e49afe42458a893be1 Mon Sep 17 00:00:00 2001
From: Flooooooooooorian <florian.florianweber.weber@googlemail.com>
Date: Tue, 22 Nov 2022 15:38:51 +0100
Subject: [PATCH 1/3] Add FeatureB

---
 git-branch-rebasing-task.iml | 2 +-
 src/FeatureA.java            | 5 +++++
 src/FeatureB.java            | 6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 src/FeatureA.java
 create mode 100644 src/FeatureB.java

diff --git a/git-branch-rebasing-task.iml b/git-branch-rebasing-task.iml
index 004be91..5325d4e 100644
--- a/git-branch-rebasing-task.iml
+++ b/git-branch-rebasing-task.iml
@@ -8,4 +8,4 @@
     <orderEntry type="jdk" jdkName="19" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
\ No newline at end of file
+</module>
diff --git a/src/FeatureA.java b/src/FeatureA.java
new file mode 100644
index 0000000..3b9a33d
--- /dev/null
+++ b/src/FeatureA.java
@@ -0,0 +1,5 @@
+public class FeatureA {
+    public static void main(String[] args) {
+        System.out.println("Hallo, das ist der Code von Florian");
+    }
+}
diff --git a/src/FeatureB.java b/src/FeatureB.java
new file mode 100644
index 0000000..7fd7a9a
--- /dev/null
+++ b/src/FeatureB.java
@@ -0,0 +1,6 @@
+public class FeatureB {
+
+    public static void main(String[] args) {
+        System.out.println("Das ist Feature B von: ");
+    }
+}

From eb2274c79225a96062779ac5686c11fa5fe07e7e Mon Sep 17 00:00:00 2001
From: Emrullah <arac.emrullah@gmail.com>
Date: Mon, 14 Jul 2025 10:53:47 +0200
Subject: [PATCH 2/3] Person B added his name

---
 src/FeatureB.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/FeatureB.java b/src/FeatureB.java
index 7fd7a9a..3a16080 100644
--- a/src/FeatureB.java
+++ b/src/FeatureB.java
@@ -1,6 +1,6 @@
 public class FeatureB {
 
     public static void main(String[] args) {
-        System.out.println("Das ist Feature B von: ");
+        System.out.println("Das ist Feature B von: Emrullah");
     }
 }

From 0ce3384f581e0b720d8e61b875f0decb0b983cee Mon Sep 17 00:00:00 2001
From: azurias <karriere-prusac@mailbox.org>
Date: Mon, 14 Jul 2025 11:20:56 +0200
Subject: [PATCH 3/3] =?UTF-8?q?Name=20ge=C3=A4ndert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/FeatureA.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/FeatureA.java b/src/FeatureA.java
index 3b9a33d..60655c1 100644
--- a/src/FeatureA.java
+++ b/src/FeatureA.java
@@ -1,5 +1,5 @@
 public class FeatureA {
     public static void main(String[] args) {
-        System.out.println("Hallo, das ist der Code von Florian");
+        System.out.println("Hallo, das ist der Code von Darian");
     }
 }