From 359c0bffb12307b691c61b3e5dd9f5064dc598a4 Mon Sep 17 00:00:00 2001 From: SV Date: Thu, 13 Jan 2022 16:19:15 +0530 Subject: [PATCH 01/47] My first commit --- test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test.txt diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..025ebec --- /dev/null +++ b/test.txt @@ -0,0 +1 @@ +This is just a test file for testing i have created From 360ca3ea10179b2c5507cd6ca06f284d95c901b6 Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 14 Jan 2022 12:29:11 +0530 Subject: [PATCH 02/47] Added more text to newfile.txt --- newfile.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 0000000..6fbc3ce --- /dev/null +++ b/newfile.txt @@ -0,0 +1,3 @@ +Just to test ls files +Adding one more line for testing +Another line added for testing From 4068e5015933b6f540cc27a765600689c7f9650b Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 14 Jan 2022 12:36:36 +0530 Subject: [PATCH 03/47] added files recursively level1 and level2 --- level1/level2/level2file.txt | 1 + level1/test1.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 level1/level2/level2file.txt create mode 100644 level1/test1.txt diff --git a/level1/level2/level2file.txt b/level1/level2/level2file.txt new file mode 100644 index 0000000..1e37f17 --- /dev/null +++ b/level1/level2/level2file.txt @@ -0,0 +1 @@ +adding some text to level2 diff --git a/level1/test1.txt b/level1/test1.txt new file mode 100644 index 0000000..ef6f3ca --- /dev/null +++ b/level1/test1.txt @@ -0,0 +1 @@ +creating test file in level1 From a0d6c331b5ec2697bc96ea7a36eaf597ed61ef37 Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 14 Jan 2022 12:51:02 +0530 Subject: [PATCH 04/47] renaming level2file.txt to file2.txt --- level1/level2/{level2file.txt => file2.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename level1/level2/{level2file.txt => file2.txt} (100%) diff --git a/level1/level2/level2file.txt b/level1/level2/file2.txt similarity index 100% rename from level1/level2/level2file.txt rename to level1/level2/file2.txt From cfb54ed730727f536b64a9f480fa2ea9528e6ddd Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 14 Jan 2022 12:58:01 +0530 Subject: [PATCH 05/47] Renaming file --- level1/{test1.txt => file1.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename level1/{test1.txt => file1.txt} (100%) diff --git a/level1/test1.txt b/level1/file1.txt similarity index 100% rename from level1/test1.txt rename to level1/file1.txt From a4300c6564c2096d401b20761494f80d1b36c527 Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 14 Jan 2022 13:02:55 +0530 Subject: [PATCH 06/47] moving file from level1 to level2 --- level1/{ => level2}/file1.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename level1/{ => level2}/file1.txt (100%) diff --git a/level1/file1.txt b/level1/level2/file1.txt similarity index 100% rename from level1/file1.txt rename to level1/level2/file1.txt From acb1cb6082cd46df6e5b7680fb1bebfe5eea908e Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 14 Jan 2022 13:08:42 +0530 Subject: [PATCH 07/47] moving file --- level1/{level2 => }/file1.txt | 0 level1/level2/level2 | 1 + 2 files changed, 1 insertion(+) rename level1/{level2 => }/file1.txt (100%) create mode 100644 level1/level2/level2 diff --git a/level1/level2/file1.txt b/level1/file1.txt similarity index 100% rename from level1/level2/file1.txt rename to level1/file1.txt diff --git a/level1/level2/level2 b/level1/level2/level2 new file mode 100644 index 0000000..ef6f3ca --- /dev/null +++ b/level1/level2/level2 @@ -0,0 +1 @@ +creating test file in level1 From 8e8612ba505d66b57a163273628e2d7406673300 Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 14 Jan 2022 13:13:16 +0530 Subject: [PATCH 08/47] Renaming file1.txt --- level1/level1.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 level1/level1.txt diff --git a/level1/level1.txt b/level1/level1.txt new file mode 100644 index 0000000..ef6f3ca --- /dev/null +++ b/level1/level1.txt @@ -0,0 +1 @@ +creating test file in level1 From a78ef40eba9983e72a240da84bc8288d80e8b8b8 Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 14 Jan 2022 13:14:27 +0530 Subject: [PATCH 09/47] renamed file1.txt t level1.txt --- level1/file1.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 level1/file1.txt diff --git a/level1/file1.txt b/level1/file1.txt deleted file mode 100644 index ef6f3ca..0000000 --- a/level1/file1.txt +++ /dev/null @@ -1 +0,0 @@ -creating test file in level1 From 59e412a61ce316361b309f2025fc2ddf739f7b14 Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 14 Jan 2022 13:22:29 +0530 Subject: [PATCH 10/47] deleted test.txt --- test.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test.txt diff --git a/test.txt b/test.txt deleted file mode 100644 index 025ebec..0000000 --- a/test.txt +++ /dev/null @@ -1 +0,0 @@ -This is just a test file for testing i have created From d4e1f05a76de9a1fb1350c81ba56f975c889bbb2 Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 14 Jan 2022 13:29:55 +0530 Subject: [PATCH 11/47] deleted newfile.txt --- newfile.txt | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt deleted file mode 100644 index 6fbc3ce..0000000 --- a/newfile.txt +++ /dev/null @@ -1,3 +0,0 @@ -Just to test ls files -Adding one more line for testing -Another line added for testing From 1b847b1c7d8721b883b8500a141659a87fe161a4 Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 14 Jan 2022 13:32:01 +0530 Subject: [PATCH 12/47] deleting level1 --- level1/level1.txt | 1 - level1/level2/file2.txt | 1 - level1/level2/level2 | 1 - 3 files changed, 3 deletions(-) delete mode 100644 level1/level1.txt delete mode 100644 level1/level2/file2.txt delete mode 100644 level1/level2/level2 diff --git a/level1/level1.txt b/level1/level1.txt deleted file mode 100644 index ef6f3ca..0000000 --- a/level1/level1.txt +++ /dev/null @@ -1 +0,0 @@ -creating test file in level1 diff --git a/level1/level2/file2.txt b/level1/level2/file2.txt deleted file mode 100644 index 1e37f17..0000000 --- a/level1/level2/file2.txt +++ /dev/null @@ -1 +0,0 @@ -adding some text to level2 diff --git a/level1/level2/level2 b/level1/level2/level2 deleted file mode 100644 index ef6f3ca..0000000 --- a/level1/level2/level2 +++ /dev/null @@ -1 +0,0 @@ -creating test file in level1 From 5f17e84b13aa05bcf898d0b7eeadd018b1f9e275 Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 14 Jan 2022 19:20:25 +0530 Subject: [PATCH 13/47] My first commit --- file.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file.txt diff --git a/file.txt b/file.txt new file mode 100644 index 0000000..fa263b8 --- /dev/null +++ b/file.txt @@ -0,0 +1 @@ +This is just a test file From d5dbc0602c7766bb31561c7c35192458f3ba7b23 Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 14 Jan 2022 20:33:03 +0530 Subject: [PATCH 14/47] Modified gitignore and file.txt --- .gitignore | 4 ++++ file.txt | 1 + 2 files changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index c1d964f..8e92db9 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,7 @@ _ide_helper.php #System Files .DS_Store Thumbs.db + + +#Testing +/file.txt \ No newline at end of file diff --git a/file.txt b/file.txt index fa263b8..b43e347 100644 --- a/file.txt +++ b/file.txt @@ -1 +1,2 @@ This is just a test file +Added line \ No newline at end of file From 32fb33fa791d084dbeb493c135a8316ad691d05f Mon Sep 17 00:00:00 2001 From: SV Date: Sun, 16 Jan 2022 11:06:21 -0800 Subject: [PATCH 15/47] Added newfile.txt --- newfile.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 0000000..cef5c84 --- /dev/null +++ b/newfile.txt @@ -0,0 +1,2 @@ +# New Files Created for Testing Purpose +This is just a testing file. \ No newline at end of file From dea5734ba8ad4238db86a3105cb150f2f063aff1 Mon Sep 17 00:00:00 2001 From: SV Date: Sun, 16 Jan 2022 11:08:06 -0800 Subject: [PATCH 16/47] modified added another line --- newfile.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/newfile.txt b/newfile.txt index cef5c84..1b6726a 100644 --- a/newfile.txt +++ b/newfile.txt @@ -1,2 +1,3 @@ # New Files Created for Testing Purpose -This is just a testing file. \ No newline at end of file +This is just a testing file. +Added another line \ No newline at end of file From 051533a2e2c800ad0891e2a8ceef9d2689e0905e Mon Sep 17 00:00:00 2001 From: SV Date: Sun, 16 Jan 2022 12:03:53 -0800 Subject: [PATCH 17/47] Update repo with change in comparison section --- file.txt | 3 ++- newfile.txt | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/file.txt b/file.txt index b43e347..ca3079c 100644 --- a/file.txt +++ b/file.txt @@ -1,2 +1,3 @@ This is just a test file -Added line \ No newline at end of file +Added line +Testing \ No newline at end of file diff --git a/newfile.txt b/newfile.txt index 1b6726a..12fd42f 100644 --- a/newfile.txt +++ b/newfile.txt @@ -1,3 +1,8 @@ # New Files Created for Testing Purpose This is just a testing file. -Added another line \ No newline at end of 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 \ No newline at end of file From 2f422442d01bf8e72a13782cd5e6fe0ed66bce2f Mon Sep 17 00:00:00 2001 From: SV Date: Sun, 16 Jan 2022 12:21:57 -0800 Subject: [PATCH 18/47] Changing file.txt --- file.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/file.txt b/file.txt index ca3079c..958f065 100644 --- a/file.txt +++ b/file.txt @@ -1,3 +1,10 @@ -This is just a test file -Added line -Testing \ No newline at end of file + + + +Test + + +

Testing file

+ + + From df2c69a6cd26528871e688347bca0fb1ec8c3c51 Mon Sep 17 00:00:00 2001 From: SV Date: Sun, 16 Jan 2022 12:29:23 -0800 Subject: [PATCH 19/47] changed file.txt to file.html --- file.html | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 file.html diff --git a/file.html b/file.html new file mode 100644 index 0000000..403590e --- /dev/null +++ b/file.html @@ -0,0 +1,8 @@ + + + +

+ This is just a test file +

+ + \ No newline at end of file From 12513cde37d57dfc930939b491f433221610e305 Mon Sep 17 00:00:00 2001 From: SV Date: Sun, 16 Jan 2022 12:35:13 -0800 Subject: [PATCH 20/47] Adding copyright notice --- file.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/file.html b/file.html index 403590e..c30c98a 100644 --- a/file.html +++ b/file.html @@ -1,3 +1,5 @@ + + From 7f1d38f8aa22c26c682f62e482598b8c38dc7d58 Mon Sep 17 00:00:00 2001 From: SV Date: Sun, 16 Jan 2022 12:36:32 -0800 Subject: [PATCH 21/47] added copyright notice --- newfile.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/newfile.txt b/newfile.txt index 12fd42f..74e8817 100644 --- a/newfile.txt +++ b/newfile.txt @@ -5,4 +5,6 @@ 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 \ No newline at end of file +Testing the difftool + +Copyright 2022 \ No newline at end of file From 2977d2f2ffcc0d1dd8e14fed1885e029c8338d00 Mon Sep 17 00:00:00 2001 From: SV Date: Sun, 16 Jan 2022 12:43:33 -0800 Subject: [PATCH 22/47] added some dummy text --- newfile.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/newfile.txt b/newfile.txt index 74e8817..db0c97b 100644 --- a/newfile.txt +++ b/newfile.txt @@ -7,4 +7,7 @@ p4Merge is the tool configured for diff and merge tool in git. Testing the difftool -Copyright 2022 \ No newline at end of file +Copyright 2022 + +testigngcnskkdfsdfsdfsdfdsf +sdfsdfksndfdsk \ No newline at end of file From 72260010ac21f95578fcc62cfbcdd0c8e2093f91 Mon Sep 17 00:00:00 2001 From: SV Date: Mon, 17 Jan 2022 12:36:15 +0530 Subject: [PATCH 23/47] added author name in file.txt --- file.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/file.txt b/file.txt index 958f065..78bf13a 100644 --- a/file.txt +++ b/file.txt @@ -6,5 +6,7 @@

Testing file

+Author:Swathi + From 84043a23f682caccc0ed90fa77fc543a33d1ecf2 Mon Sep 17 00:00:00 2001 From: SV Date: Mon, 17 Jan 2022 12:41:59 +0530 Subject: [PATCH 24/47] Added instruction in newfile.txt --- newfile.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/newfile.txt b/newfile.txt index db0c97b..79c25f6 100644 --- a/newfile.txt +++ b/newfile.txt @@ -10,4 +10,7 @@ Testing the difftool Copyright 2022 testigngcnskkdfsdfsdfsdfdsf -sdfsdfksndfdsk \ No newline at end of file +sdfsdfksndfdsk + + +Please fork this repository and then issue pull requests for review. \ No newline at end of file From f300a66f4e4728e2dd904f75c936b822821c00c7 Mon Sep 17 00:00:00 2001 From: SV Date: Tue, 18 Jan 2022 22:56:00 +0530 Subject: [PATCH 25/47] added somemore text in newfile.txt --- newfile.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/newfile.txt b/newfile.txt index 79c25f6..5e687d0 100644 --- a/newfile.txt +++ b/newfile.txt @@ -13,4 +13,6 @@ testigngcnskkdfsdfsdfsdfdsf sdfsdfksndfdsk -Please fork this repository and then issue pull requests for review. \ No newline at end of file +Please fork this repository and then issue pull requests for review. + +Adding author SV \ No newline at end of file From 46158eca6285ffffb1fa48a16932df05d6e75c77 Mon Sep 17 00:00:00 2001 From: SV Date: Tue, 18 Jan 2022 23:03:24 +0530 Subject: [PATCH 26/47] added another paragraph to file.html --- file.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/file.html b/file.html index c30c98a..1a8dc14 100644 --- a/file.html +++ b/file.html @@ -6,5 +6,8 @@

This is just a test file

+

+ Just added another paragraph +

\ No newline at end of file From 40810c5f5b90b10957d7f2bb5eba4676a5026976 Mon Sep 17 00:00:00 2001 From: SV Date: Tue, 18 Jan 2022 23:04:43 +0530 Subject: [PATCH 27/47] added anther line in file.html --- file.html | 1 + 1 file changed, 1 insertion(+) diff --git a/file.html b/file.html index 1a8dc14..52d21f8 100644 --- a/file.html +++ b/file.html @@ -8,6 +8,7 @@

Just added another paragraph + another line

\ No newline at end of file From 1af5d07d573b1ca8e7727a4ad80d67fabcce3707 Mon Sep 17 00:00:00 2001 From: SV Date: Tue, 18 Jan 2022 23:11:34 +0530 Subject: [PATCH 28/47] Making changes in file.html --- file.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/file.html b/file.html index 52d21f8..eceee27 100644 --- a/file.html +++ b/file.html @@ -10,5 +10,8 @@ Just added another paragraph another line

+

+ Dummy text +

\ No newline at end of file From a27f746fe6e45012f1a35ce237d38302ed59aa4f Mon Sep 17 00:00:00 2001 From: SV Date: Tue, 18 Jan 2022 23:13:20 +0530 Subject: [PATCH 29/47] Adding conflicting changes --- file.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/file.html b/file.html index 52d21f8..959d368 100644 --- a/file.html +++ b/file.html @@ -10,5 +10,8 @@ Just added another paragraph another line

+

+ Not a dummy text +

\ No newline at end of file From 6b68d7c41e284675a1f4427817eb99641206add0 Mon Sep 17 00:00:00 2001 From: SV Date: Tue, 18 Jan 2022 23:31:46 +0530 Subject: [PATCH 30/47] updating gitignore file to exclude orig file --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8e92db9..3c5883e 100644 --- a/.gitignore +++ b/.gitignore @@ -32,4 +32,5 @@ Thumbs.db #Testing -/file.txt \ No newline at end of file +/file.txt +*.orig \ No newline at end of file From 2faf84b116396d34de05ce98d9cb4393a4a65915 Mon Sep 17 00:00:00 2001 From: SV Date: Thu, 20 Jan 2022 22:56:43 +0530 Subject: [PATCH 31/47] added one in file.txt --- file.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/file.txt b/file.txt index 78bf13a..bd2ad57 100644 --- a/file.txt +++ b/file.txt @@ -8,5 +8,7 @@ Author:Swathi +Added line in newfile.txt + From 1b6ce26c3ddbf8719fc683099f31d64cc4c5717d Mon Sep 17 00:00:00 2001 From: SV Date: Thu, 20 Jan 2022 22:55:14 +0530 Subject: [PATCH 32/47] Modified newfile.txt --- newfile.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/newfile.txt b/newfile.txt index 5e687d0..ad9a6ea 100644 --- a/newfile.txt +++ b/newfile.txt @@ -15,4 +15,6 @@ sdfsdfksndfdsk Please fork this repository and then issue pull requests for review. -Adding author SV \ No newline at end of file +Adding author SV + +Testing Rebasing in Git \ No newline at end of file From edc0d072e43ecf144a1e52b41dc4705d43723e42 Mon Sep 17 00:00:00 2001 From: SV Date: Thu, 20 Jan 2022 23:02:49 +0530 Subject: [PATCH 33/47] testing rebase --- file.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/file.txt b/file.txt index bd2ad57..90afcb4 100644 --- a/file.txt +++ b/file.txt @@ -10,5 +10,7 @@ Author:Swathi Added line in newfile.txt +Adding another line for test + From 129898ac6280aafc457996f9038c2d8b1a5c01b3 Mon Sep 17 00:00:00 2001 From: SV Date: Thu, 20 Jan 2022 23:16:19 +0530 Subject: [PATCH 34/47] adding changes before rebase conflict --- file.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file.html b/file.html index 959d368..31f35b4 100644 --- a/file.html +++ b/file.html @@ -1,5 +1,5 @@ - + From cdefe84ebf6197d7efe4fa0fd55b3382d9ea7fda Mon Sep 17 00:00:00 2001 From: SV Date: Thu, 20 Jan 2022 23:18:57 +0530 Subject: [PATCH 35/47] mb conflicting change --- file.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/file.html b/file.html index 31f35b4..e000a08 100644 --- a/file.html +++ b/file.html @@ -13,5 +13,10 @@

Not a dummy text

+ + CbzXCNmbZXCMnzcx + \ No newline at end of file From 191af41a1b3b4664a8e33c79df50a4a19600b413 Mon Sep 17 00:00:00 2001 From: SV Date: Thu, 20 Jan 2022 23:17:41 +0530 Subject: [PATCH 36/47] adding some trouble to file.html --- file.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/file.html b/file.html index e000a08..d35c4b9 100644 --- a/file.html +++ b/file.html @@ -13,10 +13,6 @@

Not a dummy text

- - CbzXCNmbZXCMnzcx - sdgvhasdfasdhasdjahds mnabsdjhasd

\ No newline at end of file From 38608a294f097dc62b4fb806f057553c98b35f55 Mon Sep 17 00:00:00 2001 From: SV Date: Thu, 20 Jan 2022 23:29:54 +0530 Subject: [PATCH 37/47] adding changes after rebase conflict --- file.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file.html b/file.html index d35c4b9..3d3d174 100644 --- a/file.html +++ b/file.html @@ -4,7 +4,7 @@

- This is just a test file + dchjsakdd sjkdfsakjda aksjaksd asd kasdkasd

Just added another paragraph From 790959a8cdb87213e076e313fa8d90fdcf9387aa Mon Sep 17 00:00:00 2001 From: swathikoppal <33415953+swathikoppal@users.noreply.github.com> Date: Thu, 20 Jan 2022 23:48:03 +0530 Subject: [PATCH 38/47] Update file.html Added minor changes to file.html(test) Remote --- file.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/file.html b/file.html index 3d3d174..29af931 100644 --- a/file.html +++ b/file.html @@ -1,7 +1,9 @@ - + + File +

dchjsakdd sjkdfsakjda aksjaksd asd kasdkasd @@ -15,4 +17,4 @@

sdgvhasdfasdhasdjahds mnabsdjhasd

- \ No newline at end of file + From 9137fb7d313c9c7529669e96216f3d6953cd8ec0 Mon Sep 17 00:00:00 2001 From: SV Date: Thu, 20 Jan 2022 23:46:37 +0530 Subject: [PATCH 39/47] local:added new file simple.html --- simple.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 simple.html diff --git a/simple.html b/simple.html new file mode 100644 index 0000000..201f3cd --- /dev/null +++ b/simple.html @@ -0,0 +1,12 @@ + + + + + + + Document + + +

Added this paragraph

+ + \ No newline at end of file From df7f01db01617aa70e38c295a1ecb4c23fb47e32 Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 21 Jan 2022 00:03:39 +0530 Subject: [PATCH 40/47] Quick fix in production to improve --- newfile.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/newfile.txt b/newfile.txt index ad9a6ea..910cfd3 100644 --- a/newfile.txt +++ b/newfile.txt @@ -15,6 +15,7 @@ sdfsdfksndfdsk Please fork this repository and then issue pull requests for review. +msdbshadbashd nSFJKsfjsFKS FSAD FNSDFK Adding author SV Testing Rebasing in Git \ No newline at end of file From b9545d522555dc394c1449c5e6381e916dc7a17a Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 21 Jan 2022 00:06:09 +0530 Subject: [PATCH 41/47] done updating simple.html --- simple.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/simple.html b/simple.html index 201f3cd..8bda6fa 100644 --- a/simple.html +++ b/simple.html @@ -4,9 +4,11 @@ - Document + Simple

Added this paragraph

+

Adding another paragraph in simple.html file

+

agdfshf hdsfbsf hjsfsdfhbsdfsdfj sdfhsdjfsd fjhsadfjsdf hhdsajfsdf

\ No newline at end of file From 89ec5bf48ea4237ea9f41cd7a2192d581353b7ce Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 21 Jan 2022 00:17:10 +0530 Subject: [PATCH 42/47] a qucik prodn changes after the stash --- file.html | 1 + 1 file changed, 1 insertion(+) diff --git a/file.html b/file.html index 29af931..86c5734 100644 --- a/file.html +++ b/file.html @@ -16,5 +16,6 @@ Not a dummy text

sdgvhasdfasdhasdjahds mnabsdjhasd

+

A quick change after the stash

From 9ed60ecd2409b5833535402c3d9f1ed787c6b52c Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 21 Jan 2022 00:19:34 +0530 Subject: [PATCH 43/47] update to simple.html after the stash pop --- simple.html | 1 + 1 file changed, 1 insertion(+) diff --git a/simple.html b/simple.html index 8bda6fa..3c49b54 100644 --- a/simple.html +++ b/simple.html @@ -10,5 +10,6 @@

Added this paragraph

Adding another paragraph in simple.html file

agdfshf hdsfbsf hjsfsdfhbsdfsdfj sdfhsdjfsd fjhsadfjsdf hhdsajfsdf

+

vsdfsf hjasdbs dfhdsfa sdafjsadf sdfjsdafnsdf

\ No newline at end of file From 3a0ff964ec778135f01ce057a34622b964d81418 Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 21 Jan 2022 00:41:10 +0530 Subject: [PATCH 44/47] commit the changes after the git stash branch --- file.html | 2 +- newfile.txt | 5 +++++ simple.html | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/file.html b/file.html index 86c5734..063a28a 100644 --- a/file.html +++ b/file.html @@ -2,7 +2,7 @@ - File + File stash branch

diff --git a/newfile.txt b/newfile.txt index 910cfd3..f82268c 100644 --- a/newfile.txt +++ b/newfile.txt @@ -16,6 +16,11 @@ 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 index 3c49b54..e9e006e 100644 --- a/simple.html +++ b/simple.html @@ -4,7 +4,7 @@ - Simple + Updating title for multiple stash

Added this paragraph

From 75f1f70891b8a07f70eff9272744ba5de4e2b04d Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 21 Jan 2022 13:56:28 +0530 Subject: [PATCH 45/47] Changed simple.html for tagging example --- simple.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simple.html b/simple.html index e9e006e..536f072 100644 --- a/simple.html +++ b/simple.html @@ -4,7 +4,7 @@ - Updating title for multiple stash + Title for Tagging example

Added this paragraph

From 59f55dd92b25a8ee113a6b2e8cdffa24cda0d8c1 Mon Sep 17 00:00:00 2001 From: SV Date: Fri, 21 Jan 2022 13:58:48 +0530 Subject: [PATCH 46/47] Updating for tag 1.1 Update simple.html file for tagging example for another version --- simple.html | 1 + 1 file changed, 1 insertion(+) diff --git a/simple.html b/simple.html index 536f072..ce23fb2 100644 --- a/simple.html +++ b/simple.html @@ -11,5 +11,6 @@

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 From 3ed7d5571c4146204a7dc75e6e11180f62c2dbaf Mon Sep 17 00:00:00 2001 From: swathikoppal <33415953+swathikoppal@users.noreply.github.com> Date: Fri, 21 Jan 2022 23:14:46 +0530 Subject: [PATCH 47/47] Test commits to show the diff --- file.html | 1 + 1 file changed, 1 insertion(+) diff --git a/file.html b/file.html index 063a28a..c5f256e 100644 --- a/file.html +++ b/file.html @@ -17,5 +17,6 @@

sdgvhasdfasdhasdjahds mnabsdjhasd

A quick change after the stash

+ Copyright 2022