From 0927616ba939a237eef1dc866080089b9fcb0fb1 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 1 Sep 2022 11:47:44 +0530 Subject: [PATCH 01/11] Update challenge_1.md Signed-off-by: ankushkumar1840 --- Challenges/challenge_1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge_1.md b/Challenges/challenge_1.md index cd0158bfa..ca104e9bf 100644 --- a/Challenges/challenge_1.md +++ b/Challenges/challenge_1.md @@ -4,7 +4,7 @@ Welcome to the first challenge! We will start off with an easy task. Task: -Create a (new issue)[https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/new] on this repository with the following details to be added to the content of the issue: +Create a [new issue](https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/new) on this repository with the following details to be added to the content of the issue: ``` name: Add your name here From e3fa2b05acd4f1e77bd74277f635125da0184dc0 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 2 Sep 2022 12:10:51 +0530 Subject: [PATCH 02/11] Create challenge_2.md Signed-off-by: ankushkumar1840 --- Challenges/challenge_2.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Challenges/challenge_2.md diff --git a/Challenges/challenge_2.md b/Challenges/challenge_2.md new file mode 100644 index 000000000..ebf050b64 --- /dev/null +++ b/Challenges/challenge_2.md @@ -0,0 +1,11 @@ +## Welcome to Challenge 2 + +Welcome to the second challenge! +Today we will focus on how to fork and create a clone of a Github repository + +Task: +1. Create a fork of this repository +2. Clone the forked project locally in your system using the ``git clone`` command +3. Add a new comment to the issue you created in the [first task](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_1.md). The comment should have the following: +- URL of your forked repository +- A screenshot of the cloned project in your system From e6f3ca449a66768ea48e51079180b140c216313c Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sat, 3 Sep 2022 12:06:05 +0530 Subject: [PATCH 03/11] Create challenge_3.md Signed-off-by: ankushkumar1840 --- Challenges/challenge_3.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Challenges/challenge_3.md diff --git a/Challenges/challenge_3.md b/Challenges/challenge_3.md new file mode 100644 index 000000000..835579e1c --- /dev/null +++ b/Challenges/challenge_3.md @@ -0,0 +1,10 @@ +## Welcome to Challenge 3 + +Welcome to the third challenge! +Today we will focus on how to create a new branch in a git repository + +Task: +1. Following up on the [previous task](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_2.md), create a new branch locally in your forked clone repository +2. The branch name should be as follows: ``your_github_username-details``. Example: ``shivaylamba-details`` +3. Add a new comment to the issue you created in the [first task](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_1.md). The comment should have the following: +- Screenshot showing the list of all the current branches inside of your forked clone repository From fab1d47e6fa8f2ffd439e51c54055725195c7911 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sun, 4 Sep 2022 12:20:08 +0530 Subject: [PATCH 04/11] challenge 4 Signed-off-by: ankushkumar1840 --- Challenges/challenge_4.md | 11 +++++++++++ contributors/shivaylamba/shivaylamba.md | 4 ++++ 2 files changed, 15 insertions(+) create mode 100644 Challenges/challenge_4.md create mode 100644 contributors/shivaylamba/shivaylamba.md diff --git a/Challenges/challenge_4.md b/Challenges/challenge_4.md new file mode 100644 index 000000000..42336996c --- /dev/null +++ b/Challenges/challenge_4.md @@ -0,0 +1,11 @@ +## Welcome to Challenge 4 + +Welcome to the fourth challenge! +Today we cover how to Update Fork Repo From the Original Repo + +The main repository has been updated since the last fork that all of you created. The goal is to updated the forked repository with the changes made in the original repository. This can be done with the git command of ``git remote add upstream`` + +Task +1. Update your forked repository locally with the content of the original repository for both the main branch and the branch that you created in Challenge 3 using the ``git remote add upstream`` command +2. Once the changes in the forked repository and the original repository are synced in the git branch that you created in the 3rd Challenge, Add a new comment to the issue you created in the [first task](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_1.md). The comment should have the following: +- Screenshot showing the latest repository contents \ No newline at end of file diff --git a/contributors/shivaylamba/shivaylamba.md b/contributors/shivaylamba/shivaylamba.md new file mode 100644 index 000000000..6e3107508 --- /dev/null +++ b/contributors/shivaylamba/shivaylamba.md @@ -0,0 +1,4 @@ +--- +name: Shivay Lamba +github_user: shivaylamba +--- \ No newline at end of file From 9bc690355947e1f3418277f5167280bc28e510ea Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 5 Sep 2022 10:35:54 +0530 Subject: [PATCH 05/11] Challenge 5 Signed-off-by: ankushkumar1840 --- Challenges/challenge_5.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 Challenges/challenge_5.md diff --git a/Challenges/challenge_5.md b/Challenges/challenge_5.md new file mode 100644 index 000000000..860e46c4c --- /dev/null +++ b/Challenges/challenge_5.md @@ -0,0 +1,28 @@ +## Welcome to Challenge 5 + +Welcome to the fourth challenge! +Today's goal is to update your forked repository and then create a Pull Request + +Task +1. Ensure your forked repository is in sync with the latest changes in the main repository. Also ensure that the git branch that you created in Challenge 2 is also in sync with the latest changes +2. Create a new folder inside the `contributors` folder, and name it with your github username. It should look something like this `contributors//`. Ex. + +``` +contributors/shivaylamba/ +``` + +3. Create a markdown file in the folder you created following the naming convention for the file: `.md`. Ex. + +``` +contributors/shivaylamba/shivaylamba.md +``` + +4. Copy the following template into your file, delete the placeholder text and fill the information with yours. + +``` +--- +name: your_name +github_user_name: YOUR-GITHUB-USERNAME +--- +``` +5. Submit your Pull Request \ No newline at end of file From d902567b2c38567fb97e6549e31b38795540cb39 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 5 Sep 2022 10:36:17 +0530 Subject: [PATCH 06/11] Update challenge_5.md Signed-off-by: ankushkumar1840 --- Challenges/challenge_5.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Challenges/challenge_5.md b/Challenges/challenge_5.md index 860e46c4c..3d05c739f 100644 --- a/Challenges/challenge_5.md +++ b/Challenges/challenge_5.md @@ -1,6 +1,6 @@ ## Welcome to Challenge 5 -Welcome to the fourth challenge! +Welcome to the fifth challenge! Today's goal is to update your forked repository and then create a Pull Request Task @@ -25,4 +25,4 @@ name: your_name github_user_name: YOUR-GITHUB-USERNAME --- ``` -5. Submit your Pull Request \ No newline at end of file +5. Submit your Pull Request From 7e6753715299684b523c0df1f6090af627ed96b0 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 5 Sep 2022 10:37:48 +0530 Subject: [PATCH 07/11] Update challenge_5.md Signed-off-by: ankushkumar1840 --- Challenges/challenge_5.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge_5.md b/Challenges/challenge_5.md index 3d05c739f..3053335a2 100644 --- a/Challenges/challenge_5.md +++ b/Challenges/challenge_5.md @@ -25,4 +25,4 @@ name: your_name github_user_name: YOUR-GITHUB-USERNAME --- ``` -5. Submit your Pull Request +5. Submit your Pull Request on the main challenge repo. From b75d63f1347607fb061e1d38ee8c5121bebf53ad Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 6 Sep 2022 10:42:13 +0530 Subject: [PATCH 08/11] Combine multiple commit into 1 Create challenge_6.md Update challenge_6.md Create challenge_7.md Signed-off-by: ankushkumar1840 --- Challenges/challenge_6.md | 19 +++++++++++++++++++ Challenges/challenge_7.md | 9 +++++++++ 2 files changed, 28 insertions(+) create mode 100644 Challenges/challenge_6.md create mode 100644 Challenges/challenge_7.md diff --git a/Challenges/challenge_6.md b/Challenges/challenge_6.md new file mode 100644 index 000000000..701d59f78 --- /dev/null +++ b/Challenges/challenge_6.md @@ -0,0 +1,19 @@ +## Welcome to Challenge 6 + +Welcome to the sixth challenge! +Today's goal is to update your pull request that you created in [Challenge 5](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_5.md?plain=1) + +Task +1. Create a new commit in the branch you created in Challenge 2 in your forked repository +2. The change that you have to make should be the following: +In the markdown file that was created in Challenge 5, edit the details as follows: +``` +--- +name: your_name +github_user_name: YOUR-GITHUB-USERNAME +url_of_github_issue: Link_of_the_github_issue_created_in_first_challenge +--- +``` +3. After making this change create a commit with a proper commit message and push the changes +4. Check if the commit reflects in the Pull request you created in Challenge 5 + diff --git a/Challenges/challenge_7.md b/Challenges/challenge_7.md new file mode 100644 index 000000000..fe5cfb0bf --- /dev/null +++ b/Challenges/challenge_7.md @@ -0,0 +1,9 @@ +## Welcome to Challenge 7 + +Welcome to the seventh challenge! +Today's goal is to implement the squashing of the git commits. Squashing is used to combine multiple commits into one. This is done using the interactive mode of Git Rebase command. +In the [6th Challenge](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_6.md?plain=1) all of you created an additional commit to update the markdown file. +So refer to [this guide](https://www.freecodecamp.org/news/git-squash-explained/) on Git merge. + +Task: +1. Using the interactive mode of Git Rebase command combine the multiple commits created in your Pull requests and then push that to the Pull request you have created in the previous challenges. From 96fd33b6355ee0d658daf2b12ee9b5e5851c3a81 Mon Sep 17 00:00:00 2001 From: ankushkumar1840 Date: Wed, 7 Sep 2022 15:38:11 +0530 Subject: [PATCH 09/11] added myself in contributer folder Signed-off-by: ankushkumar1840 --- contributors/Ankush123456-code/Ankush123456-code.md | 4 ++++ contributors/shivaylamba/shivaylamba.md | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 contributors/Ankush123456-code/Ankush123456-code.md delete mode 100644 contributors/shivaylamba/shivaylamba.md diff --git a/contributors/Ankush123456-code/Ankush123456-code.md b/contributors/Ankush123456-code/Ankush123456-code.md new file mode 100644 index 000000000..3c3d67d87 --- /dev/null +++ b/contributors/Ankush123456-code/Ankush123456-code.md @@ -0,0 +1,4 @@ +--- +name: Ankush kunwar +github_user: Ankush123456-code +--- \ No newline at end of file diff --git a/contributors/shivaylamba/shivaylamba.md b/contributors/shivaylamba/shivaylamba.md deleted file mode 100644 index 6e3107508..000000000 --- a/contributors/shivaylamba/shivaylamba.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -name: Shivay Lamba -github_user: shivaylamba ---- \ No newline at end of file From 00f2bcd070cbfb170c0ecca3c4e1cfa6a996d195 Mon Sep 17 00:00:00 2001 From: ankushkumar1840 Date: Wed, 7 Sep 2022 15:42:36 +0530 Subject: [PATCH 10/11] issue url updated Signed-off-by: ankushkumar1840 --- contributors/Ankush123456-code/Ankush123456-code.md | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors/Ankush123456-code/Ankush123456-code.md b/contributors/Ankush123456-code/Ankush123456-code.md index 3c3d67d87..09c1e7f9a 100644 --- a/contributors/Ankush123456-code/Ankush123456-code.md +++ b/contributors/Ankush123456-code/Ankush123456-code.md @@ -1,4 +1,5 @@ --- name: Ankush kunwar github_user: Ankush123456-code +url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/461 --- \ No newline at end of file From fd496d472282b0885fa4b149e74e9df4f3efde74 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 6 Sep 2022 10:42:13 +0530 Subject: [PATCH 11/11] Create challenge_6.md --- Challenges/challenge_6.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Challenges/challenge_6.md b/Challenges/challenge_6.md index 701d59f78..63c3e7641 100644 --- a/Challenges/challenge_6.md +++ b/Challenges/challenge_6.md @@ -1,19 +1,21 @@ ## Welcome to Challenge 6 -Welcome to the sixth challenge! +Welcome to the sixth challenge! Today's goal is to update your pull request that you created in [Challenge 5](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_5.md?plain=1) Task -1. Create a new commit in the branch you created in Challenge 2 in your forked repository -2. The change that you have to make should be the following: -In the markdown file that was created in Challenge 5, edit the details as follows: + +1. Create a new commit in the branch you created in Challenge 2 in your forked repository +2. The change that you have to make should be the following: + In the markdown file that was created in Challenge 5, edit the details as follows: + ``` --- name: your_name github_user_name: YOUR-GITHUB-USERNAME -url_of_github_issue: Link_of_the_github_issue_created_in_first_challenge +url_of_github_isse: Link_of_the_github_issue_created_in_first_challenge --- ``` -3. After making this change create a commit with a proper commit message and push the changes -4. Check if the commit reflects in the Pull request you created in Challenge 5 +3. After making this change create a commit with a proper commit message and push the changes +4. Check if the commit reflects in the Pull request you created in Challenge 5