From 10bc4b9585d90d5b46f28780394f908d0ac69dff Mon Sep 17 00:00:00 2001 From: ADITYA RAI <97426655+Adi-R12@users.noreply.github.com> Date: Sun, 2 Apr 2023 02:06:59 +0530 Subject: [PATCH 01/11] Update README.md --- README.md | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/README.md b/README.md index 2675424..8b13789 100644 --- a/README.md +++ b/README.md @@ -1,34 +1 @@ -# Git_Ready -## Task 2 - -This task consists of the following steps. - -### Step 1 - -- Checkout to `task2` branch. -- Create a text file named as `github-username.txt`. For example, if github username is *prakriti583* then file name will be `prakriti583.txt`. -- Write the name of your Room Mate in the first line of the file. -- Commit this change. - -## Step 2 - -- Create a new branch `feature` (and switch to it) from `task2` branch. -- Mention two of his/her habits that annoy you on **lines 2 and 3** of the file. -- Commit this change. - -## Step 3 - -- Switch back to the `task2` branch. -- Write 2-3 sentences on what misconceptions you had about them initially, just below their name i.e. on lines 2 and 3. -- Commit this change. - -## Final step - -- Bring the changes from `feature` branch into the `task2` branch. - -*At the end of this task, you should have exactly 4 commits and the data entered in both step 2 & 3 must be present in the file. Push these changes and make a PR. Be sure to mention the Issue No. as well in the PR.* - -
- -Checkout to branch `task3` for the next task. From fd687b3b8d6d1f1a2babdbd4b6ff82406e5a5041 Mon Sep 17 00:00:00 2001 From: ADITYA RAI <97426655+Adi-R12@users.noreply.github.com> Date: Sun, 2 Apr 2023 02:12:30 +0530 Subject: [PATCH 02/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8b13789..27b8970 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ - +## Git_Ready From a0062b6e5155740e2023ea904d42102fc4083a45 Mon Sep 17 00:00:00 2001 From: Prakriti-19 <111135506+Prakriti-19@users.noreply.github.com> Date: Sun, 2 Apr 2023 02:17:04 +0530 Subject: [PATCH 03/11] Update README.md --- README.md | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 37b4399..bd44536 100644 --- a/README.md +++ b/README.md @@ -1 +1,19 @@ -# Git_Ready \ No newline at end of file +# Git_Ready + +## Task 1 +Your first Task consists of 3 steps. + +### Step-1 +In your forked Repository you have to Create a .html file like Prakriti-19.html and paste the code given in template.html(replacing with your details). + + ### Step-2 +Now, you have to host it on Github and keep the link of the hosted website for Step-3. + +### Step-3 +Create a Pull Request and while creating it mention the link of the Github Page in the description of the Pull Request. +![image](https://user-images.githubusercontent.com/74846797/149649303-5670735d-0802-4d76-954d-58dbcdf72483.png) + + +
+ +Checkout to branch `task2` for the next task From b14092b34071a10bf89cd2c4f879c1f46f2712d1 Mon Sep 17 00:00:00 2001 From: Prakriti-19 <111135506+Prakriti-19@users.noreply.github.com> Date: Sun, 2 Apr 2023 02:17:44 +0530 Subject: [PATCH 04/11] Create Template.html --- Template.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Template.html diff --git a/Template.html b/Template.html new file mode 100644 index 0000000..862527c --- /dev/null +++ b/Template.html @@ -0,0 +1,14 @@ + + + + + + + Document + + +

Your Name

+

Your Roll No

+

Your Discord Id

+ + From 574f16cca4ed7abbf8d1d7519c6a1624e6e76129 Mon Sep 17 00:00:00 2001 From: ADITYA RAI <97426655+Adi-R12@users.noreply.github.com> Date: Sun, 2 Apr 2023 02:19:41 +0530 Subject: [PATCH 05/11] Update README.md --- README.md | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/README.md b/README.md index c48cb05..4c1abea 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,2 @@ # Git_Ready - -## Task 1 -Your first Task consists of 3 steps. - -### Step-1 -In your forked Repository you have to Create a .html file like Prakriti-19.html and paste the code given in template.html(replacing with your details). - - ### Step-2 -Now, you have to host it on Github and keep the link of the hosted website for Step-3. - -### Step-3 -Create a Pull Request and while creating it mention the link of the Github Page in the description of the Pull Request. -![image](https://user-images.githubusercontent.com/74846797/149649303-5670735d-0802-4d76-954d-58dbcdf72483.png) - - -
- -Checkout to branch `task2` for the next task - From 0c0fb0a7448bc2f4519cfba76aa3617f98b18c53 Mon Sep 17 00:00:00 2001 From: Prakriti-19 <111135506+Prakriti-19@users.noreply.github.com> Date: Sun, 2 Apr 2023 02:20:48 +0530 Subject: [PATCH 06/11] Delete Template.html --- Template.html | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 Template.html diff --git a/Template.html b/Template.html deleted file mode 100644 index 862527c..0000000 --- a/Template.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - Document - - -

Your Name

-

Your Roll No

-

Your Discord Id

- - From b9f0d47cd24fec312353da2fc0c47e80c2dd6f58 Mon Sep 17 00:00:00 2001 From: Prakriti-19 <111135506+Prakriti-19@users.noreply.github.com> Date: Sun, 2 Apr 2023 02:27:52 +0530 Subject: [PATCH 07/11] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4c1abea..e4e034e 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ - # Git_Ready +* The contest will be of duration one and a half hours after which no responses will be considered +* There are three tasks with each task being in a different branch +* Checkout to the branch task1 for the first task From 04457d0b669fb62fb521045dd6c7d3d3cfa9a2ad Mon Sep 17 00:00:00 2001 From: Prakriti-19 <111135506+Prakriti-19@users.noreply.github.com> Date: Sun, 2 Apr 2023 02:29:26 +0530 Subject: [PATCH 08/11] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e4e034e..114fb36 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,5 @@ * The contest will be of duration one and a half hours after which no responses will be considered * There are three tasks with each task being in a different branch * Checkout to the branch task1 for the first task + +All the Best!! From c31bcf726441d6f7c912b2afc25c8a3fd966e0af Mon Sep 17 00:00:00 2001 From: Prakriti-19 <111135506+Prakriti-19@users.noreply.github.com> Date: Sun, 2 Apr 2023 02:33:58 +0530 Subject: [PATCH 09/11] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 114fb36..4dc7f3c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Git_Ready * The contest will be of duration one and a half hours after which no responses will be considered +* Do follow the PR Template to get your score raised in the leadreboard:) * There are three tasks with each task being in a different branch * Checkout to the branch task1 for the first task -All the Best!! + ## **All The Best!!** From b5a26932b6dcdad4bca450331f9026ad65d77211 Mon Sep 17 00:00:00 2001 From: Hannah2k23 <129401594+Hannah2k23@users.noreply.github.com> Date: Sun, 2 Apr 2023 19:20:02 +0530 Subject: [PATCH 10/11] Add files via upload --- Hannah2k23.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Hannah2k23.txt diff --git a/Hannah2k23.txt b/Hannah2k23.txt new file mode 100644 index 0000000..e69de29 From 1fea1f05bede180b09de5c0336cda4d42533979b Mon Sep 17 00:00:00 2001 From: Hannah2k23 <129401594+Hannah2k23@users.noreply.github.com> Date: Sun, 2 Apr 2023 19:23:09 +0530 Subject: [PATCH 11/11] Update Hannah2k23.txt --- Hannah2k23.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Hannah2k23.txt b/Hannah2k23.txt index e69de29..4806bd6 100644 --- a/Hannah2k23.txt +++ b/Hannah2k23.txt @@ -0,0 +1,3 @@ + +Sometimes she talks too loudly on phone that I get disturbed. +Her things remain scattered on the bed.