From 22f569a54ffe67482d75bd833d5dd418a1294529 Mon Sep 17 00:00:00 2001
From: Shafin <mahmood1807074@stud.kuet.ac.bd>
Date: Wed, 27 Apr 2022 12:47:24 +0600
Subject: [PATCH 1/8] Java file added

---
 JavaFile.java | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 JavaFile.java

diff --git a/JavaFile.java b/JavaFile.java
new file mode 100644
index 0000000..f7b01ef
--- /dev/null
+++ b/JavaFile.java
@@ -0,0 +1,27 @@
+public class JavaFile {
+        
+    int variable;
+    String works;
+    
+    public JavaFile(int v, String s) {
+        variable=v;
+        works=s;
+    }
+
+    public int getVariable() {
+        return variable;
+    }
+
+    public void setVariable(int variable) {
+        this.variable = variable;
+    }
+
+    public String getWorks() {
+        return works;
+    }
+
+    public void setWorks(String works) {
+        this.works = works;
+    }
+    
+}
\ No newline at end of file

From 10b962c0b04fea53876effd46a41e37c365a3f07 Mon Sep 17 00:00:00 2001
From: Shafin <mahmood1807074@stud.kuet.ac.bd>
Date: Wed, 27 Apr 2022 12:50:21 +0600
Subject: [PATCH 2/8] Commit done by 1807074

---
 JavaFile.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/JavaFile.java b/JavaFile.java
index f7b01ef..d9e504f 100644
--- a/JavaFile.java
+++ b/JavaFile.java
@@ -3,6 +3,11 @@ public class JavaFile {
     int variable;
     String works;
     
+    public JavaFile(){
+        variable=23;
+        works="Nothing";
+    }
+
     public JavaFile(int v, String s) {
         variable=v;
         works=s;

From 9ecec8d2fc81a7e50bb99ce0ee2611d3f817e0de Mon Sep 17 00:00:00 2001
From: Shafin <mahmood1807074@stud.kuet.ac.bd>
Date: Wed, 27 Apr 2022 12:55:12 +0600
Subject: [PATCH 3/8] JavaFile2 added by 1807074

---
 JavaFile2.java | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 JavaFile2.java

diff --git a/JavaFile2.java b/JavaFile2.java
new file mode 100644
index 0000000..08b5fd7
--- /dev/null
+++ b/JavaFile2.java
@@ -0,0 +1,36 @@
+/**
+ * JavaFile2
+ */
+public class JavaFile2 {
+
+    int roll;
+    String name;
+    
+    public int getRoll() {
+        return roll;
+    }
+
+    public void setRoll(int roll) {
+        this.roll = roll;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public JavaFile2(){
+        roll=1807074;
+        name="Shafin";
+    }
+
+    public JavaFile2(int roll, String name) {
+        this.roll = roll;
+        this.name = name;
+    }
+
+    
+}
\ No newline at end of file

From 52702beb079eeb7f0d5040ee16f8b5cec5cf3a29 Mon Sep 17 00:00:00 2001
From: Wahid Mahmood Shafin <mahmood1807074@stud.kuet.ac.bd>
Date: Wed, 11 May 2022 22:50:50 +0600
Subject: [PATCH 4/8] Created Conflict.txt

---
 Conflict.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Conflict.txt

diff --git a/Conflict.txt b/Conflict.txt
new file mode 100644
index 0000000..5898fc8
--- /dev/null
+++ b/Conflict.txt
@@ -0,0 +1,2 @@
+In this file I will create merge conflict.
+I will solve it.

From ef8148ee105cea3dc9a8c9cee7fa7670da85d591 Mon Sep 17 00:00:00 2001
From: Shafin <mahmood1807074@stud.kuet.ac.bd>
Date: Wed, 11 May 2022 22:53:06 +0600
Subject: [PATCH 5/8] COnflicted.txt created locally

---
 Conflict.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Conflict.txt

diff --git a/Conflict.txt b/Conflict.txt
new file mode 100644
index 0000000..fae5a29
--- /dev/null
+++ b/Conflict.txt
@@ -0,0 +1,2 @@
+In this file I will create merge conflict.
+I have solved it.
\ No newline at end of file

From 2b28d93d045d8e52afac8e0cadb6281f45c049b4 Mon Sep 17 00:00:00 2001
From: Shafin <mahmood1807074@stud.kuet.ac.bd>
Date: Wed, 11 May 2022 22:59:05 +0600
Subject: [PATCH 6/8] .gitignore file updated

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 1eec882..599fdc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 sampleTest
-web-ext-artifacts
\ No newline at end of file
+web-ext-artifacts
+ignore.txt

From 9c31e067d541435fa742bc7dbf156c9357943757 Mon Sep 17 00:00:00 2001
From: Shafin <mahmood1807074@stud.kuet.ac.bd>
Date: Tue, 17 May 2022 21:03:21 +0600
Subject: [PATCH 7/8] branch conflict commited

---
 branch_conflict.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch_conflict.txt

diff --git a/branch_conflict.txt b/branch_conflict.txt
new file mode 100644
index 0000000..9228fa5
--- /dev/null
+++ b/branch_conflict.txt
@@ -0,0 +1 @@
+First file.
\ No newline at end of file

From 402c9c420579939d3924b3f3592191c1c58e4333 Mon Sep 17 00:00:00 2001
From: Shafin <mahmood1807074@stud.kuet.ac.bd>
Date: Tue, 17 May 2022 21:06:53 +0600
Subject: [PATCH 8/8] branch2 conflict commited

---
 branch_conflict.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/branch_conflict.txt b/branch_conflict.txt
index 9228fa5..9c6c126 100644
--- a/branch_conflict.txt
+++ b/branch_conflict.txt
@@ -1 +1 @@
-First file.
\ No newline at end of file
+Second File.
\ No newline at end of file