From 693063c367d6206b39b19828f364bf800a0091ec Mon Sep 17 00:00:00 2001
From: Tushar Kumar Roy <tusharkumarroy.dev@gmail.com>
Date: Thu, 21 Aug 2025 05:53:53 +0600
Subject: [PATCH 1/5] Add Student.java with getters, setters, constructor

---
 Student.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 Student.java

diff --git a/Student.java b/Student.java
new file mode 100644
index 000000000000..df6403e2db0f
--- /dev/null
+++ b/Student.java
@@ -0,0 +1,12 @@
+public class Student {
+    private String name;
+    private int id;
+
+    public Student(String name, int id) { this.name = name; this.id = id; }
+
+    public String getName() { return name; }
+    public int getId() { return id; }
+
+    public void setName(String name) { this.name = name; }
+    public void setId(int id) { this.id = id; }
+}

From e8a43f0a3e96578479188e082f8867a4032c5dac Mon Sep 17 00:00:00 2001
From: Tushar Kumar Roy <tusharkumarroy.dev@gmail.com>
Date: Thu, 21 Aug 2025 06:05:53 +0600
Subject: [PATCH 2/5] Added Calculator.java with basic operations (add , sub ,
 mul , dev)

---
 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 000000000000..d33d4bed66c2
--- /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 int divide(int a, int b) {
+        if (b == 0) throw new IllegalArgumentException("Cannot divide by zero");
+        return a / b;
+    }
+}

From dcda634fe0f493c566f41526f5cc6dc7f507881e Mon Sep 17 00:00:00 2001
From: Tushar Kumar Roy <tusharkumarroy.dev@gmail.com>
Date: Thu, 21 Aug 2025 06:20:06 +0600
Subject: [PATCH 3/5] Modified add method in master to create a  conflict

---
 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 000000000000..1b6e0801f9b4
--- /dev/null
+++ b/Calculator.java
@@ -0,0 +1,9 @@
+public class Calculator {
+    public int add(int a, int b) { return a + b + 10; }  // modifying master to create merge conflict
+    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 IllegalArgumentException("Cannot divide by zero");
+        return a / b;
+    }
+}

From c20000c77d52a99d9983dbfab79c8f83c0c7c471 Mon Sep 17 00:00:00 2001
From: Tushar Kumar Roy <tusharkumarroy.dev@gmail.com>
Date: Thu, 21 Aug 2025 06:22:26 +0600
Subject: [PATCH 4/5] Modified add method in feature/calculator differently to
 create a conflict

---
 Calculator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Calculator.java b/Calculator.java
index d33d4bed66c2..40f9dc3d0518 100644
--- a/Calculator.java
+++ b/Calculator.java
@@ -1,5 +1,5 @@
 public class Calculator {
-    public int add(int a, int b) { return a + b; }
+    public int add(int a, int b) { return a + b + 20; }   // different modification in feature/calculator to create conflict
     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) {

From 4136739040362b4781b3f1afffef3c5fe5967756 Mon Sep 17 00:00:00 2001
From: Tushar Kumar Roy <tusharkumarroy.dev@gmail.com>
Date: Thu, 21 Aug 2025 06:47:11 +0600
Subject: [PATCH 5/5] Added Grade.java with grading methods

---
 Grade.java | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 Grade.java

diff --git a/Grade.java b/Grade.java
new file mode 100644
index 000000000000..8d32063286e4
--- /dev/null
+++ b/Grade.java
@@ -0,0 +1,8 @@
+public class Grade {
+    public String getGrade(int marks) {
+        if (marks >= 90) return "A";
+        if (marks >= 75) return "B";
+        if (marks >= 60) return "C";
+        return "F";
+    }
+}