Branch2

.gitignore

@@ -1,2 +1,3 @@
 sampleTest
-web-ext-artifacts
+web-ext-artifacts
+ignore.txt

Conflict.txt

@@ -0,0 +1,2 @@
+In this file I will create merge conflict.
+I have solved it.

JavaFile.java

@@ -0,0 +1,32 @@
+public class JavaFile {
+
+    int variable;
+    String works;
+
+    public JavaFile(){
+        variable=23;
+        works="Nothing";
+    }
+
+    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;
+    }
+
+}

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;
+    }
+
+
+}

branch_conflict.txt

@@ -0,0 +1 @@
+Second File.