From 23faac65422420789e7a17a720f58c457fc70771 Mon Sep 17 00:00:00 2001 From: HarshProj <112640334+HarshProj@users.noreply.github.com> Date: Thu, 6 Jul 2023 16:10:57 +0530 Subject: [PATCH 1/4] hello --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 61cb3b0..6997aba 100644 --- a/README.md +++ b/README.md @@ -14,3 +14,4 @@ Welcome! This is the sandbox repository for the [Foundations of Git](https://lea 5. Success! Refer back to [course lessons](https://learn.gitkraken.com) for exercises. +hgsggdf \ No newline at end of file From d96df2b38904504cb211ff7004e56be1f10dea36 Mon Sep 17 00:00:00 2001 From: Jonathan Silva Date: Mon, 3 Oct 2022 13:49:38 -0700 Subject: [PATCH 2/4] Provide reset instructions for sample repo --- README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6997aba..47a4d51 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,12 @@ Welcome! This is the sandbox repository for the [Foundations of Git](https://lea 5. Success! Refer back to [course lessons](https://learn.gitkraken.com) for exercises. -hgsggdf \ No newline at end of file +<<<<<<< anotheone +hgsggdf +======= +## Resetting the repo + +Each exercise will provide instructions on how to reset the repo to the previous state. + +However, to completely reset the repo back to its original state, consider deleting your GitHub fork and your local copy of the repository on your machine. Then follow the instructions above to fork and clone the repo once more. +>>>>>>> Provide reset instructions for sample repo From 2e43742e328c71531197d26df8ce4d5a2adcb405 Mon Sep 17 00:00:00 2001 From: HarshProj <112640334+HarshProj@users.noreply.github.com> Date: Thu, 6 Jul 2023 16:04:48 +0530 Subject: [PATCH 3/4] Adding new features --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 47a4d51..1fe4604 100644 --- a/README.md +++ b/README.md @@ -22,4 +22,11 @@ hgsggdf Each exercise will provide instructions on how to reset the repo to the previous state. However, to completely reset the repo back to its original state, consider deleting your GitHub fork and your local copy of the repository on your machine. Then follow the instructions above to fork and clone the repo once more. +<<<<<<< anotheone >>>>>>> Provide reset instructions for sample repo +======= + + +#Featuers +Adding new features in the repo +>>>>>>> Adding new features From f694db5af5d8dec0440ccc2d5b6ea7fae6bb0537 Mon Sep 17 00:00:00 2001 From: HarshProj <112640334+HarshProj@users.noreply.github.com> Date: Thu, 6 Jul 2023 16:08:15 +0530 Subject: [PATCH 4/4] hey there --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 1fe4604..cdf0c0b 100644 --- a/README.md +++ b/README.md @@ -28,5 +28,9 @@ However, to completely reset the repo back to its original state, consider delet #Featuers +<<<<<<< anotheone Adding new features in the repo >>>>>>> Adding new features +======= +Adding new features in the repo another pond +>>>>>>> hey there