From 43e3c61d9e2c2a93bc88b5746ff6c1d9dfb211db Mon Sep 17 00:00:00 2001
From: Meghatania03 <141716710+Meghatania03@users.noreply.github.com>
Date: Thu, 21 Aug 2025 18:47:48 +0600
Subject: [PATCH 1/3] added student.java

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

diff --git a/student.java b/student.java
new file mode 100644
index 0000000..36c50fe
--- /dev/null
+++ b/student.java
@@ -0,0 +1,15 @@
+public class Student {
+    private String name;
+    private int age;
+
+    public Student(String name, int age) {
+        this.name = name;
+        this.age = age;
+    }
+
+    public String getName() { return name; }
+    public void setName(String name) { this.name = name; }
+
+    public int getAge() { return age; }
+    public void setAge(int age) { this.age = age; }
+}

From bdfc475de783821e9ca561f3ca694155be4fd29f Mon Sep 17 00:00:00 2001
From: Meghatania03 <141716710+Meghatania03@users.noreply.github.com>
Date: Thu, 21 Aug 2025 18:57:29 +0600
Subject: [PATCH 2/3] added calculator.java

---
 calculator.java | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 calculator.java

diff --git a/calculator.java b/calculator.java
new file mode 100644
index 0000000..dbed2ef
--- /dev/null
+++ b/calculator.java
@@ -0,0 +1,9 @@
+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 double divide(int a, int b) {
+        if(b == 0) throw new ArithmeticException("Cannot divide by zero");
+        return (double)a / b;
+    }
+}

From 21969f2e7badf393cbbe05773177b1dac79f8163 Mon Sep 17 00:00:00 2001
From: Meghatania03 <141716710+Meghatania03@users.noreply.github.com>
Date: Thu, 21 Aug 2025 19:20:09 +0600
Subject: [PATCH 3/3] Feature branch: updated divide method differently

---
 calculator.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/calculator.java b/calculator.java
index dbed2ef..df07c88 100644
--- a/calculator.java
+++ b/calculator.java
@@ -2,8 +2,9 @@ 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 double divide(int a, int b) {
-        if(b == 0) throw new ArithmeticException("Cannot divide by zero");
-        return (double)a / b;
-    }
+   public double divide(int a, int b) {
+    if (b == 0) return 0; // feature/calculator change
+    return a / b;  // integer division
+}
+
 }