From 892f7ff3dcb53dbc5c730a4fb5da4056bed8fcf2 Mon Sep 17 00:00:00 2001 From: Rahul Kumar Date: Mon, 5 Sep 2022 13:14:36 +0530 Subject: [PATCH 01/12] Day 5 Signed-off-by: iamrahul8 --- contributors/shivaylamba/iamrahul8/iamrahul8.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 contributors/shivaylamba/iamrahul8/iamrahul8.md diff --git a/contributors/shivaylamba/iamrahul8/iamrahul8.md b/contributors/shivaylamba/iamrahul8/iamrahul8.md new file mode 100644 index 000000000..98e9ee3cb --- /dev/null +++ b/contributors/shivaylamba/iamrahul8/iamrahul8.md @@ -0,0 +1,4 @@ +--- +name: Rahul Kumar +github_user_name: iamrahul8 +--- \ No newline at end of file From b1d3e834549a27ddd64a3e1966ed202b891f4c5a Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 6 Sep 2022 10:42:13 +0530 Subject: [PATCH 02/12] Create challenge_6.md Update challenge_6.md Challenge 6 : Added url_of_github_issue file renamed Signed-off-by: iamrahul8 --- Challenges/challenge_6.md | 19 +++++++++++++++++++ contributors/iamrahul8/iamrahul8.md | 5 +++++ .../shivaylamba/iamrahul8/iamrahul8.md | 4 ---- 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 Challenges/challenge_6.md create mode 100644 contributors/iamrahul8/iamrahul8.md delete mode 100644 contributors/shivaylamba/iamrahul8/iamrahul8.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/contributors/iamrahul8/iamrahul8.md b/contributors/iamrahul8/iamrahul8.md new file mode 100644 index 000000000..334a96b7f --- /dev/null +++ b/contributors/iamrahul8/iamrahul8.md @@ -0,0 +1,5 @@ +--- +name: Rahul Kumar +github_user_name: iamrahul8 +url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/105 +--- diff --git a/contributors/shivaylamba/iamrahul8/iamrahul8.md b/contributors/shivaylamba/iamrahul8/iamrahul8.md deleted file mode 100644 index 98e9ee3cb..000000000 --- a/contributors/shivaylamba/iamrahul8/iamrahul8.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -name: Rahul Kumar -github_user_name: iamrahul8 ---- \ No newline at end of file From 120da1dedd4d9d8fdc269e6f7b802b264982591a Mon Sep 17 00:00:00 2001 From: iamrahul8 Date: Thu, 8 Sep 2022 15:00:14 +0530 Subject: [PATCH 03/12] Challenge 8 - added iamrahul8.md file Signed-off-by: iamrahul8 --- contributors/iamrahul8/iamrahul8-2.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 contributors/iamrahul8/iamrahul8-2.md diff --git a/contributors/iamrahul8/iamrahul8-2.md b/contributors/iamrahul8/iamrahul8-2.md new file mode 100644 index 000000000..2167bf467 --- /dev/null +++ b/contributors/iamrahul8/iamrahul8-2.md @@ -0,0 +1,6 @@ +--- +name: Rahul Kumar +github_user_name: iamrahul8 +url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/105 +url_of_pull_request: https://github.com/scaleracademy/scaler-september-open-source-challenge/pull/539 +--- From 260b7959a0c7982d2c636ad0cde7c3c0ba019d17 Mon Sep 17 00:00:00 2001 From: iamrahul8 Date: Fri, 9 Sep 2022 17:16:36 +0530 Subject: [PATCH 04/12] Revert "Challenge 8 - added iamrahul8.md file" This reverts commit 45161d58d9c3aa20ff78dfa8144c73742e986948. Signed-off-by: iamrahul8 --- contributors/iamrahul8/iamrahul8-2.md | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 contributors/iamrahul8/iamrahul8-2.md diff --git a/contributors/iamrahul8/iamrahul8-2.md b/contributors/iamrahul8/iamrahul8-2.md deleted file mode 100644 index 2167bf467..000000000 --- a/contributors/iamrahul8/iamrahul8-2.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -name: Rahul Kumar -github_user_name: iamrahul8 -url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/105 -url_of_pull_request: https://github.com/scaleracademy/scaler-september-open-source-challenge/pull/539 ---- From ed31301fa793f20cbe395761779db664f23d5164 Mon Sep 17 00:00:00 2001 From: iamrahul8 Date: Sat, 10 Sep 2022 13:45:15 +0530 Subject: [PATCH 05/12] Challenge 10 - changes iamrahul8.md Signed-off-by: iamrahul8 --- contributors/iamrahul8/iamrahul8.md | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors/iamrahul8/iamrahul8.md b/contributors/iamrahul8/iamrahul8.md index 334a96b7f..839b39ee6 100644 --- a/contributors/iamrahul8/iamrahul8.md +++ b/contributors/iamrahul8/iamrahul8.md @@ -2,4 +2,5 @@ name: Rahul Kumar github_user_name: iamrahul8 url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/105 +your_favroite_programming_language: c++ --- From f51ec5fb4b83fe8feda17b422aba24cbf43040c8 Mon Sep 17 00:00:00 2001 From: Rahul Kumar Date: Mon, 5 Sep 2022 13:14:36 +0530 Subject: [PATCH 06/12] Day 5 Signed-off-by: iamrahul8 Create challenge_6.md Update challenge_6.md Challenge 6 : Added url_of_github_issue file renamed Signed-off-by: iamrahul8 Challenge 8 - added iamrahul8.md file Signed-off-by: iamrahul8 Revert "Challenge 8 - added iamrahul8.md file" This reverts commit 45161d58d9c3aa20ff78dfa8144c73742e986948. Signed-off-by: iamrahul8 Challenge 10 - changes iamrahul8.md Signed-off-by: iamrahul8 --- Challenges/challenge_6.md | 19 +++++++++++++++++++ contributors/iamrahul8/iamrahul8.md | 6 ++++++ 2 files changed, 25 insertions(+) create mode 100644 Challenges/challenge_6.md create mode 100644 contributors/iamrahul8/iamrahul8.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/contributors/iamrahul8/iamrahul8.md b/contributors/iamrahul8/iamrahul8.md new file mode 100644 index 000000000..839b39ee6 --- /dev/null +++ b/contributors/iamrahul8/iamrahul8.md @@ -0,0 +1,6 @@ +--- +name: Rahul Kumar +github_user_name: iamrahul8 +url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/105 +your_favroite_programming_language: c++ +--- From acccbc4f0db00cf2b94f6cce2539ed8461eb3dc7 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Wed, 7 Sep 2022 11:51:57 +0530 Subject: [PATCH 07/12] Create challenge_7.md --- Challenges/challenge_7.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Challenges/challenge_7.md 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 3b5255d0e85942f9a01925108734e7460fad47bd Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 8 Sep 2022 11:53:19 +0530 Subject: [PATCH 08/12] Create challenge_8.md --- Challenges/challenge_8.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Challenges/challenge_8.md diff --git a/Challenges/challenge_8.md b/Challenges/challenge_8.md new file mode 100644 index 000000000..3647ad565 --- /dev/null +++ b/Challenges/challenge_8.md @@ -0,0 +1,11 @@ +## Welcome to Challenge 8 + +Welcome to the 8th challenge! + +Today's challenge is simple. But along side the task, please give the [following article](https://www.atlassian.com/git/tutorials/undoing-changes/git-reset) a read, as this will be used in Challenge 9. + + +Task: +1. Inside the branch you created during the prior challenges in your forked repository, make a new file by the name of ``your-github-username-2.md`` and add any details you may want to add to this markwdown file and push the change + +2. Ensure the change appears in the Pull request. From 490c907d55c8ca9f2d31fbe3b722419c8f4f62c7 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 8 Sep 2022 11:53:39 +0530 Subject: [PATCH 09/12] Update challenge_8.md --- Challenges/challenge_8.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge_8.md b/Challenges/challenge_8.md index 3647ad565..a143bd663 100644 --- a/Challenges/challenge_8.md +++ b/Challenges/challenge_8.md @@ -8,4 +8,4 @@ Today's challenge is simple. But along side the task, please give the [following Task: 1. Inside the branch you created during the prior challenges in your forked repository, make a new file by the name of ``your-github-username-2.md`` and add any details you may want to add to this markwdown file and push the change -2. Ensure the change appears in the Pull request. +2. Ensure the change appears in the Pull request created in previous challenges From a654f79072cdb6cf3bcb418d92f994e3ae7dba30 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 9 Sep 2022 11:27:55 +0530 Subject: [PATCH 10/12] Create challenge_9.md --- Challenges/challenge_9.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Challenges/challenge_9.md diff --git a/Challenges/challenge_9.md b/Challenges/challenge_9.md new file mode 100644 index 000000000..895473b94 --- /dev/null +++ b/Challenges/challenge_9.md @@ -0,0 +1,19 @@ +## Welcome to Challenge 9 + +Welcome to the ninth challenge! + +Today's task is a continuation of yesterday's task [Task 8](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_8.md?plain=1). + +Yesterday the task was to create an additional commit in your branch. And today's focus will be to remove that commit that has been pushed from the pull request created in previous challenges. The main purpose of this is because there can be times when you might push an unncessary or wrong commit and you way want to remove it from your pull request. + +This can be done by using the following command: ``git reset`` + +Here is an article you can refer to for understanding how git reset works: https://www.atlassian.com/git/tutorials/undoing-changes/git-reset#:~:text=a%20shared%20repository.-,Summary,Index%2C%20and%20the%20Working%20Directory. + +So the task is to identity the commit id of the commit you want to remove, use the git reset command, and remove the commit from the pull request by force pushing into it. + + +Task: +1. Identify the commit id that needs to be removed (you should have created this in the 8th Challenge) +2. Use git reset and force push, to remove the commit from your pull request. +3. Share a screenshot of this, in the issue you created in previous challenges. From 74af73a834401dfdde76b2042c513959a3e45e9d Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sat, 10 Sep 2022 09:52:15 +0530 Subject: [PATCH 11/12] Create challenge_10.md --- Challenges/challenge_10.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Challenges/challenge_10.md diff --git a/Challenges/challenge_10.md b/Challenges/challenge_10.md new file mode 100644 index 000000000..bbe1a7709 --- /dev/null +++ b/Challenges/challenge_10.md @@ -0,0 +1,22 @@ +## Welcome to Challenge 10 + +Welcome to the 10th challenge! + +Today's challenge is based on the concept of signing your commits. Signing the commits is a way of showing that only authentic commits are being made. + +A lot of open source projects have DCO which stands for [Developer Certification of Origin](https://github.com/apps/dco) including this repository itself and it tries to verify that each commit is signed or not. In case your commit is not signed it will reflect in the pull request that it doesn't pass the DCO test. + +You can read more about how to sign commits [here](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits) + +Task: +1. Setup the ability to sign commits locally in your systems +2. Whenever committing in the future always try to use signed commits +3. Make a new signed commit to the pull request that you have made in previous challenges by making this change to the ``yourusername.md`` file: +``` +--- +name: your_name +github_user_name: YOUR-GITHUB-USERNAME +url_of_github_issue: Link_of_the_github_issue_created_in_first_challenge +your_favroite_programming_language: Add your favorite programming language here +--- +``` From 2c40b2822fdd87830b0aaf61b8e939fbfb0c8f3e Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sun, 11 Sep 2022 15:49:34 +0530 Subject: [PATCH 12/12] Create challenge_11.md --- Challenges/challenge_11.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Challenges/challenge_11.md diff --git a/Challenges/challenge_11.md b/Challenges/challenge_11.md new file mode 100644 index 000000000..fa1527fa9 --- /dev/null +++ b/Challenges/challenge_11.md @@ -0,0 +1,9 @@ +## Welcome to Challenge 11 + +Welcome to the 11th challenge! + +Today's challenge is simple. + +Task: +1. Create another branch from your current branch created in previous challenges (Don't create a new branch from main). +2. Share screenshot of this new branch in the issue created in previous challenge