From fadb554cd30180df64679bc4ab9cd9baf4970dea Mon Sep 17 00:00:00 2001 From: dinesh1patel Date: Wed, 5 May 2021 14:16:41 +0100 Subject: [PATCH 1/9] add some html --- index.html | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/index.html b/index.html index 9cacbcd..dfababd 100644 --- a/index.html +++ b/index.html @@ -1,11 +1,11 @@ - - -Page Title - - - -

This is a another Heading

-

First paragraph another paragraph

- - - + + +Page Title + + + +

This is a another Heading

+

First paragraph another paragraph

+ + + From 80bf92027820bc9774c9882f761efbdef5ef5b67 Mon Sep 17 00:00:00 2001 From: dinesh1patel Date: Wed, 5 May 2021 14:20:46 +0100 Subject: [PATCH 2/9] add another p tag --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index dfababd..d7a2926 100644 --- a/index.html +++ b/index.html @@ -3,9 +3,9 @@ Page Title - -

This is a another Heading

-

First paragraph another paragraph

- +

This is a another Heading

+

First paragraph another paragraph

+

This is a Heading

+

This is a paragraph another paragraph

From 6592f4a4c91ae209f78411d8668feb9919476db4 Mon Sep 17 00:00:00 2001 From: dinesh1patel <74076102+dinesh1patel@users.noreply.github.com> Date: Wed, 5 May 2021 14:18:29 +0100 Subject: [PATCH 3/9] Update index.html --- index.html | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index d7a2926..ed65cfd 100644 --- a/index.html +++ b/index.html @@ -3,9 +3,15 @@ Page Title -

This is a another Heading

-

First paragraph another paragraph

-

This is a Heading

-

This is a paragraph another paragraph

+ +

This is a another Heading

+

First paragraph another paragraph

+

This is a Heading

+

This is a paragraph another paragraph

+ + +

Whatever

+ +>>>>>>> 4b385d7 (Update index.html) From 9472f525a0050816655c1fc275b4e21395890768 Mon Sep 17 00:00:00 2001 From: dinesh1patel Date: Wed, 5 May 2021 14:33:43 +0100 Subject: [PATCH 4/9] some more additions to index.html locally --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index ed65cfd..9a9cd34 100644 --- a/index.html +++ b/index.html @@ -11,6 +11,7 @@

This is a Heading

Whatever

+

Whatever3

>>>>>>> 4b385d7 (Update index.html) From 1f7299644138f88082c7a5a1b9358445b67f15ee Mon Sep 17 00:00:00 2001 From: dinesh1patel <74076102+dinesh1patel@users.noreply.github.com> Date: Wed, 5 May 2021 14:31:34 +0100 Subject: [PATCH 5/9] Update index.html --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 9a9cd34..c5d4775 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,7 @@

This is a another Heading

First paragraph another paragraph

This is a Heading

+

This is a another Heading

This is a paragraph another paragraph

From 38385cf6766e96fa93cfd5910049122c668afe32 Mon Sep 17 00:00:00 2001 From: dinesh1patel <74076102+dinesh1patel@users.noreply.github.com> Date: Wed, 5 May 2021 14:34:43 +0100 Subject: [PATCH 6/9] Update index.html --- index.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/index.html b/index.html index c5d4775..2deb02e 100644 --- a/index.html +++ b/index.html @@ -9,8 +9,12 @@

This is a another Heading

This is a Heading

This is a another Heading

This is a paragraph another paragraph

+<<<<<<< HEAD +======= +

Whatever44

+>>>>>>> 010afa1 (Update index.html)

Whatever

Whatever3

From 59ad98c2c4200761e4b62881fa59b225774a6207 Mon Sep 17 00:00:00 2001 From: dinesh1patel Date: Wed, 5 May 2021 15:04:37 +0100 Subject: [PATCH 7/9] conflict resolution --- index.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/index.html b/index.html index 2deb02e..af3f9be 100644 --- a/index.html +++ b/index.html @@ -9,15 +9,11 @@

This is a another Heading

This is a Heading

This is a another Heading

This is a paragraph another paragraph

-<<<<<<< HEAD - -=======

Whatever44

->>>>>>> 010afa1 (Update index.html) +

Whatever

Whatever3

->>>>>>> 4b385d7 (Update index.html) From 0f80df332c47ed5c0208b8351a8ea4dc8045bec9 Mon Sep 17 00:00:00 2001 From: dinesh1patel Date: Wed, 5 May 2021 15:51:41 +0100 Subject: [PATCH 8/9] amended readme.txt --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a69d511..21d2fba 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # learning-git -Git repo testing of branching and committing +Git repo testing of branching and committing (amended) From 90058c56dc4e5044d5a3cc42dddaa66e04ab734a Mon Sep 17 00:00:00 2001 From: dinesh1patel Date: Wed, 1 Sep 2021 12:22:08 +0100 Subject: [PATCH 9/9] minor change --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21d2fba..1b87a42 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # learning-git -Git repo testing of branching and committing (amended) +Git repo testing of branching and committing (amended) test