From 708e6bc430922673a415078281aeab492e10a936 Mon Sep 17 00:00:00 2001
From: Siam <siambasher0009@gmail.com>
Date: Sat, 20 Sep 2025 20:23:02 +0600
Subject: [PATCH 1/3] Add Student class with getters, setters, and constructor

---
 src/student.java | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 src/student.java

diff --git a/src/student.java b/src/student.java
new file mode 100644
index 0000000..e534f28
--- /dev/null
+++ b/src/student.java
@@ -0,0 +1,35 @@
+public class Student {
+    private String name;
+    private int age;
+
+    // Constructor
+    public Student(String name, int age) {
+        this.name = name;
+        this.age = age;
+    }
+
+    // Getter for name
+    public String getName() {
+        return name;
+    }
+
+    // Setter for name
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    // Getter for age
+    public int getAge() {
+        return age;
+    }
+
+    // Setter for age
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+    // Optional: method to display student info
+    public void displayInfo() {
+        System.out.println("Student Name: " + name + ", Age: " + age);
+    }
+}

From 951182ba6fb0e7b08175c7411716d3b0a3190e6f Mon Sep 17 00:00:00 2001
From: Siam <siambasher0009@gmail.com>
Date: Sat, 20 Sep 2025 20:24:46 +0600
Subject: [PATCH 2/3] Add Calculator class with add, subtract, multiply, divide
 methods

---
 src/Calculator.java | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 src/Calculator.java

diff --git a/src/Calculator.java b/src/Calculator.java
new file mode 100644
index 0000000..80c7f25
--- /dev/null
+++ b/src/Calculator.java
@@ -0,0 +1,29 @@
+public class Calculator {
+
+    public int add(int a, int b) {
+        return a + b;
+    }
+
+    public int subtract(int a, int b) {
+        return a - b;
+    }
+
+    public int multiply(int a, int b) {
+        return a * b;
+    }
+
+    public int divide(int a, int b) {
+        if (b == 0) {
+            throw new ArithmeticException("Cannot divide by zero");
+        }
+        return a / b;
+    }
+
+    // Optional: method to test the calculator
+    public void testCalculator() {
+        System.out.println("Add 5 + 3 = " + add(5, 3));
+        System.out.println("Subtract 5 - 3 = " + subtract(5, 3));
+        System.out.println("Multiply 5 * 3 = " + multiply(5, 3));
+        System.out.println("Divide 6 / 3 = " + divide(6, 3));
+    }
+}

From 7dd22965a28aae8ab68ef476ee707d14f0804e90 Mon Sep 17 00:00:00 2001
From: Siam <siambasher0009@gmail.com>
Date: Sat, 20 Sep 2025 20:29:20 +0600
Subject: [PATCH 3/3] Modify add method in feature/calculator to create
 conflict

---
 src/Calculator.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Calculator.java b/src/Calculator.java
index 80c7f25..c339c68 100644
--- a/src/Calculator.java
+++ b/src/Calculator.java
@@ -1,9 +1,8 @@
 public class Calculator {
 
     public int add(int a, int b) {
-        return a + b;
-    }
-
+    return a + b + 2; // deliberately different change
+}
     public int subtract(int a, int b) {
         return a - b;
     }