gothinkster · swathikoppal · Jan 13, 2022 · Jan 14, 2022 · Jan 14, 2022 · Jan 14, 2022
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,8 @@ _ide_helper.php
 #System Files
 .DS_Store
 Thumbs.db
+
+
+#Testing
+/file.txt
+*.orig
diff --git a/file.html b/file.html
@@ -0,0 +1,22 @@
+<!-- Copyright -->
+<!-- Adding changes for rebase conflict -->
+<!DOCTYPE html>
+<head>
+    <title>File stash branch</title>
+</head>
+<body>
+    <p>
+        dchjsakdd sjkdfsakjda aksjaksd asd kasdkasd
+    </p>
+    <p>
+        Just added another paragraph
+        another line
+    </p>
+    <p>
+        Not a dummy text
+    </p>
+    <p>sdgvhasdfasdhasdjahds mnabsdjhasd</p>
+    <p>A quick change after the stash</p>
+    Copyright 2022
+</body>
+</html>
diff --git a/file.txt b/file.txt
@@ -0,0 +1,16 @@
+<!doctype>
+<html>
+<head>
+<title>Test</title>
+</head>
+<body>
+<p>Testing file</p>
+
+Author:Swathi 
+
+Added line in newfile.txt
+
+Adding another line for test
+
+</body>
+</html>
diff --git a/newfile.txt b/newfile.txt
@@ -0,0 +1,26 @@
+# New Files Created for Testing Purpose
+This is just a testing file.
+Added another line
+
+Adding few more line to check diff tool and merge tool configured in git
+p4Merge is the tool configured for diff and merge tool in git.
+
+Testing the difftool
+
+Copyright 2022
+
+testigngcnskkdfsdfsdfsdfdsf
+sdfsdfksndfdsk
+
+
+Please fork this repository and then issue pull requests for review.
+
+msdbshadbashd nSFJKsfjsFKS FSAD FNSDFK
+
+jsdafbjsdfsdf
+
+
+asdmfsdmfdsf
+Adding author SV
+
+Testing Rebasing in Git
diff --git a/simple.html b/simple.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Title for Tagging example</title>
+</head>
+<body>
+    <p>Added this paragraph</p>
+    <p>Adding another paragraph in simple.html file</p>
+    <p>agdfshf hdsfbsf hjsfsdfhbsdfsdfj sdfhsdjfsd fjhsadfjsdf hhdsajfsdf</p>
+    <p>vsdfsf hjasdbs dfhdsfa sdafjsadf sdfjsdafnsdf</p>
+    <p>Added another paragraph for tagging example</p>
+</body>
+</html>