diff --git a/.gitignore b/.gitignore index c1d964f..3c5883e 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,8 @@ _ide_helper.php #System Files .DS_Store Thumbs.db + + +#Testing +/file.txt +*.orig \ No newline at end of file diff --git a/file.html b/file.html new file mode 100644 index 0000000..c5f256e --- /dev/null +++ b/file.html @@ -0,0 +1,22 @@ + + + + + File stash branch + + +

+ dchjsakdd sjkdfsakjda aksjaksd asd kasdkasd +

+

+ Just added another paragraph + another line +

+

+ Not a dummy text +

+

sdgvhasdfasdhasdjahds mnabsdjhasd

+

A quick change after the stash

+ Copyright 2022 + + diff --git a/file.txt b/file.txt new file mode 100644 index 0000000..90afcb4 --- /dev/null +++ b/file.txt @@ -0,0 +1,16 @@ + + + +Test + + +

Testing file

+ +Author:Swathi + +Added line in newfile.txt + +Adding another line for test + + + diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 0000000..f82268c --- /dev/null +++ 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 \ No newline at end of file diff --git a/simple.html b/simple.html new file mode 100644 index 0000000..ce23fb2 --- /dev/null +++ b/simple.html @@ -0,0 +1,16 @@ + + + + + + + Title for Tagging example + + +

Added this paragraph

+

Adding another paragraph in simple.html file

+

agdfshf hdsfbsf hjsfsdfhbsdfsdfj sdfhsdjfsd fjhsadfjsdf hhdsajfsdf

+

vsdfsf hjasdbs dfhdsfa sdafjsadf sdfjsdafnsdf

+

Added another paragraph for tagging example

+ + \ No newline at end of file