From 53dc066177baceab8ac147eef71737d3eef2b216 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 5 Sep 2022 10:36:17 +0530 Subject: [PATCH 1/7] Update challenge_5.md Signed-off-by: gavelprashant99 --- 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 aaebe7a7ce16e43bbb11ec9e2d4628d5de60085e Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 5 Sep 2022 10:37:48 +0530 Subject: [PATCH 2/7] Update challenge_5.md Signed-off-by: gavelprashant99 --- 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 23b545ef763501ac5f9f2fafbd107a8fbc55f045 Mon Sep 17 00:00:00 2001 From: Prashant Kumar Gavel <95560956+gavelprashant99@users.noreply.github.com> Date: Mon, 5 Sep 2022 11:09:23 +0530 Subject: [PATCH 3/7] Create gavelprashant99.md Signed-off-by: gavelprashant99 --- contributors/gavelprashant99/gavelprashant99.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 contributors/gavelprashant99/gavelprashant99.md diff --git a/contributors/gavelprashant99/gavelprashant99.md b/contributors/gavelprashant99/gavelprashant99.md new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/contributors/gavelprashant99/gavelprashant99.md @@ -0,0 +1 @@ + From 25f517e7213e958230df7c97bff46148abaa5c55 Mon Sep 17 00:00:00 2001 From: Prashant Kumar Gavel <95560956+gavelprashant99@users.noreply.github.com> Date: Mon, 5 Sep 2022 11:10:45 +0530 Subject: [PATCH 4/7] Update gavelprashant99.md Signed-off-by: gavelprashant99 --- contributors/gavelprashant99/gavelprashant99.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contributors/gavelprashant99/gavelprashant99.md b/contributors/gavelprashant99/gavelprashant99.md index 8b1378917..5dc07a2fe 100644 --- a/contributors/gavelprashant99/gavelprashant99.md +++ b/contributors/gavelprashant99/gavelprashant99.md @@ -1 +1,2 @@ - +name: Prashant Gavel +github_user_name: gavelprashant99 From 555f9f2e3f50c7c5bb3e73749de6eb77e7cc6691 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 6 Sep 2022 10:42:13 +0530 Subject: [PATCH 5/7] Squash all commits Signed-off-by: gavelprashant99 --- Challenges/challenge_6.md | 19 +++++++++++++++++++ Challenges/challenge_7.md | 9 +++++++++ .../gavelprashant99/gavelprashant99.md | 1 + 3 files changed, 29 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. diff --git a/contributors/gavelprashant99/gavelprashant99.md b/contributors/gavelprashant99/gavelprashant99.md index 5dc07a2fe..f4758d1a2 100644 --- a/contributors/gavelprashant99/gavelprashant99.md +++ b/contributors/gavelprashant99/gavelprashant99.md @@ -1,2 +1,3 @@ name: Prashant Gavel github_user_name: gavelprashant99 +url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/202 From bc397217fe5714c68d6620ba74eaf7b83b1a8378 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 6 Sep 2022 10:42:13 +0530 Subject: [PATCH 6/7] Squash all commits Signed-off-by: gavelprashant99 --- Challenges/challange_8.md | 1 + Challenges/challenge_10.md | 22 +++++++++++++++++++ Challenges/challenge_11.md | 9 ++++++++ Challenges/challenge_12.md | 14 ++++++++++++ Challenges/challenge_13.md | 10 +++++++++ Challenges/challenge_14.md | 11 ++++++++++ Challenges/challenge_15.md | 15 +++++++++++++ Challenges/challenge_6.md | 9 ++++---- Challenges/challenge_6.md.orig | 19 ++++++++++++++++ Challenges/challenge_8.md | 11 ++++++++++ Challenges/challenge_9.md | 19 ++++++++++++++++ challengers-list.md | 4 ++++ .../gavelprashant99/file_to_be_stashed.md | 1 + .../gavelprashant99/gavelprashant99.md | 1 + 14 files changed, 142 insertions(+), 4 deletions(-) create mode 100644 Challenges/challange_8.md create mode 100644 Challenges/challenge_10.md create mode 100644 Challenges/challenge_11.md create mode 100644 Challenges/challenge_12.md create mode 100644 Challenges/challenge_13.md create mode 100644 Challenges/challenge_14.md create mode 100644 Challenges/challenge_15.md create mode 100644 Challenges/challenge_6.md.orig create mode 100644 Challenges/challenge_8.md create mode 100644 Challenges/challenge_9.md create mode 100644 challengers-list.md create mode 100644 contributors/gavelprashant99/file_to_be_stashed.md diff --git a/Challenges/challange_8.md b/Challenges/challange_8.md new file mode 100644 index 000000000..2e0182139 --- /dev/null +++ b/Challenges/challange_8.md @@ -0,0 +1 @@ +created challenge 8created challenge 8created challenge 8created challenge 8created challenge 8created challenge 8created challenge 8created challenge 8 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 +--- +``` 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 diff --git a/Challenges/challenge_12.md b/Challenges/challenge_12.md new file mode 100644 index 000000000..c08629ea4 --- /dev/null +++ b/Challenges/challenge_12.md @@ -0,0 +1,14 @@ +## Welcome to Challenge 12 + +Welcome to the 12th Challenge + +Today's challenge is a re-practice of the 7th Challenge (https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_7.md?plain=1) + +So focus for this challenge will be to practice the ``git rebase`` command. We still see a number of Pull requests that have a lot more commits than there should be, therefore we give you a chance to correct it again. + +Ensure to practice the ``git rebase`` command by creating your own local git repository. You can checkout this guide: https://www.freecodecamp.org/news/git-squash-explained/ + +Task: +1. Practice git rebase, and how to squash commit using git rebase in your local projects +2. Once done, try to squash the commits in your pull request in the Challenge repository +3. We also see a lot of challengers are not signing their commits. Refer to Challenge 10: https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_10.md and ensure to sign your commits. diff --git a/Challenges/challenge_13.md b/Challenges/challenge_13.md new file mode 100644 index 000000000..9744d811a --- /dev/null +++ b/Challenges/challenge_13.md @@ -0,0 +1,10 @@ +## Welcome to Challenge 13 + +Welcome to the 13th Challenge + +Today's challenge involves how to use ``git stash`` command effectively. You can refer on how to stash your commits [here](https://git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning) + +Task: +1. Inside the branch you created in the previous challenge ``your-username-details`` create a new file inside the ``contributors//`` directory. +2. Use the git stash command to move these changes to the stash area +3. Delete the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge diff --git a/Challenges/challenge_14.md b/Challenges/challenge_14.md new file mode 100644 index 000000000..8c9f97f81 --- /dev/null +++ b/Challenges/challenge_14.md @@ -0,0 +1,11 @@ +## Welcome to Challenge 14 + +Welcome to the 14th Challenge + +Today is the first part of the two challenges related to resolving merge conflicts. You can take a look at [this article](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) to learn more about merge conflicts. + +As part of the challenge, try to create a scenario of a merge conflict locally in your system for a project that you can create. + +Task: +1. Follow the article shared above and try to reproduce a case of merge conflict in your system for a project and try to resolve it +2. Share appropriate screenshot in the issue created in the first challenge. diff --git a/Challenges/challenge_15.md b/Challenges/challenge_15.md new file mode 100644 index 000000000..5e12e937a --- /dev/null +++ b/Challenges/challenge_15.md @@ -0,0 +1,15 @@ +## Welcome to Challenge 15 + +Welcome to the 15th Challenge + +In this 2 part challenge, we will try to emulate and fix merge conflicts via git. + +Today is the first part of this challenge: + +Task: +1. Update your Forked Repo From the Original Repo. Also ensure that your branch ``your-user-name-details`` is also synced with the latest changes from the original repository + +2. In your branch ``your-user-name-details`` open the add your name to the list of challengers inside the ``challengers-list.md`` file by following the format in the file. + +3. Push your change to reflect in the Pull Request created in previous challenges + diff --git a/Challenges/challenge_6.md b/Challenges/challenge_6.md index 701d59f78..2b7f234b1 100644 --- a/Challenges/challenge_6.md +++ b/Challenges/challenge_6.md @@ -1,8 +1,4 @@ -## 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: @@ -12,6 +8,11 @@ In the markdown file that was created in Challenge 5, edit the details as follow name: your_name github_user_name: YOUR-GITHUB-USERNAME url_of_github_issue: Link_of_the_github_issue_created_in_first_challenge +<<<<<<< HEAD +======= +url_of_github_isse: Link_of_the_github_issue_created_in_first_challenge +======= +>>>>>>> 4ef8315 (Update challenge_6.md) --- ``` 3. After making this change create a commit with a proper commit message and push the changes diff --git a/Challenges/challenge_6.md.orig b/Challenges/challenge_6.md.orig new file mode 100644 index 000000000..701d59f78 --- /dev/null +++ b/Challenges/challenge_6.md.orig @@ -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_8.md b/Challenges/challenge_8.md new file mode 100644 index 000000000..a143bd663 --- /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 created in previous challenges 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. diff --git a/challengers-list.md b/challengers-list.md new file mode 100644 index 000000000..f6b21e81c --- /dev/null +++ b/challengers-list.md @@ -0,0 +1,4 @@ +# List of challengers +1. [Mrinal](https://github.com/mrinal1224) +2. [Shivay](https://github.com/shivaylamba) +3. [Prashant Gavel](https://github.com/gavelprashant99) diff --git a/contributors/gavelprashant99/file_to_be_stashed.md b/contributors/gavelprashant99/file_to_be_stashed.md new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/contributors/gavelprashant99/file_to_be_stashed.md @@ -0,0 +1 @@ + diff --git a/contributors/gavelprashant99/gavelprashant99.md b/contributors/gavelprashant99/gavelprashant99.md index f4758d1a2..7a8457136 100644 --- a/contributors/gavelprashant99/gavelprashant99.md +++ b/contributors/gavelprashant99/gavelprashant99.md @@ -1,3 +1,4 @@ name: Prashant Gavel github_user_name: gavelprashant99 url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/202 +your_favroite_programming_language: JavaScript From 15486c29ceb33924d1612d7eeb7cf196b134be14 Mon Sep 17 00:00:00 2001 From: gavelprashant99 Date: Fri, 16 Sep 2022 18:32:39 +0530 Subject: [PATCH 7/7] new commit Signed-off-by: gavelprashant99 --- resolving-merge-conflict | 1 + 1 file changed, 1 insertion(+) create mode 160000 resolving-merge-conflict diff --git a/resolving-merge-conflict b/resolving-merge-conflict new file mode 160000 index 000000000..af7bd708e --- /dev/null +++ b/resolving-merge-conflict @@ -0,0 +1 @@ +Subproject commit af7bd708e64f4595b22d2756671c3e48a03cfe8d