From 8cd19d608cd6decfee9e501c2904d1d3d0b33990 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 2 Sep 2022 12:10:51 +0530 Subject: [PATCH 01/31] Create challenge_2.md Signed-off-by: Shubhansu kumar --- 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 5f64fa3e6bf1251b9c019fb2fca5081393f14698 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sat, 3 Sep 2022 12:06:05 +0530 Subject: [PATCH 02/31] Create challenge_3.md Signed-off-by: Shubhansu kumar --- 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 3e99ce95ca73183cd4270d9ec545e10a4593ba40 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sun, 4 Sep 2022 12:20:08 +0530 Subject: [PATCH 03/31] challenge 4 Signed-off-by: Shubhansu kumar --- 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 b1050ac54601de47bb42436eb53380a78de303df Mon Sep 17 00:00:00 2001 From: shubhansu-kr Date: Mon, 5 Sep 2022 19:44:39 +0530 Subject: [PATCH 04/31] Challenge5: Create a contributor folder Signed-off-by: Shubhansu kumar --- contributors/shivaylamba/shubhansu-kr/shubhansu-kr.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 contributors/shivaylamba/shubhansu-kr/shubhansu-kr.md diff --git a/contributors/shivaylamba/shubhansu-kr/shubhansu-kr.md b/contributors/shivaylamba/shubhansu-kr/shubhansu-kr.md new file mode 100644 index 000000000..d4ebe55c8 --- /dev/null +++ b/contributors/shivaylamba/shubhansu-kr/shubhansu-kr.md @@ -0,0 +1,4 @@ +--- +name: Shubhansu kumar singh +github_user_name: shubhansu-kr +--- \ No newline at end of file From d0b2ee96795db6a6fa9ae0601637b7a6e21a221c Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 5 Sep 2022 10:35:54 +0530 Subject: [PATCH 05/31] Challenge 5 Signed-off-by: Shubhansu kumar --- 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 a94cf175ce8f8c7d248d74c441c3d1b12b0e3bef Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 5 Sep 2022 10:36:17 +0530 Subject: [PATCH 06/31] Update challenge_5.md Signed-off-by: Shubhansu kumar --- 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 f26d7a0e2c01b0431b8a37b38fef8b82bf019115 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 5 Sep 2022 10:37:48 +0530 Subject: [PATCH 07/31] Update challenge_5.md Signed-off-by: Shubhansu kumar --- 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 2e4e29e800e8f2b2706f3ef7c289c7f6419dde35 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 6 Sep 2022 10:42:13 +0530 Subject: [PATCH 08/31] Create challenge_6.md Signed-off-by: Shubhansu kumar --- Challenges/challenge_6.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Challenges/challenge_6.md diff --git a/Challenges/challenge_6.md b/Challenges/challenge_6.md new file mode 100644 index 000000000..aea62ab79 --- /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_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 + From f5b372e987308a4fabe76b3cc6fbd182c90b7be2 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 6 Sep 2022 10:42:27 +0530 Subject: [PATCH 09/31] Update challenge_6.md Signed-off-by: Shubhansu kumar --- Challenges/challenge_6.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge_6.md b/Challenges/challenge_6.md index aea62ab79..701d59f78 100644 --- a/Challenges/challenge_6.md +++ b/Challenges/challenge_6.md @@ -11,7 +11,7 @@ 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_isse: Link_of_the_github_issue_created_in_first_challenge +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 From f4ea2b2de67757c085791523f8c46025c291459a Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Wed, 7 Sep 2022 11:51:57 +0530 Subject: [PATCH 10/31] Create challenge_7.md Signed-off-by: Shubhansu kumar --- 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 8c0d1939b7d35d783839e5bd9721c4f639bb7b24 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 8 Sep 2022 11:53:19 +0530 Subject: [PATCH 11/31] Create challenge_8.md Signed-off-by: Shubhansu kumar --- 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 ca55a6d5e8a6b8d6a1b31c95454c91c4b0bbc094 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 8 Sep 2022 11:53:39 +0530 Subject: [PATCH 12/31] Update challenge_8.md Signed-off-by: Shubhansu kumar --- 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 9c735ca8aa38db050b5ba812449522df5f3b5ee1 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 9 Sep 2022 11:27:55 +0530 Subject: [PATCH 13/31] Create challenge_9.md Signed-off-by: Shubhansu kumar --- 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 7b070578f2e784a754ced361c75b31c9113c9368 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sat, 10 Sep 2022 09:52:15 +0530 Subject: [PATCH 14/31] Create challenge_10.md Signed-off-by: Shubhansu kumar --- 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 cd3dfd85c8f953ba1729f1115b4f97b897886df6 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sun, 11 Sep 2022 15:49:34 +0530 Subject: [PATCH 15/31] Create challenge_11.md Signed-off-by: Shubhansu kumar --- 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 From 2311b55832e7af275dbffcc7b30f5fced2652775 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 12 Sep 2022 13:29:37 +0530 Subject: [PATCH 16/31] Create challenge_12.md Signed-off-by: Shubhansu kumar --- Challenges/challenge_12.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Challenges/challenge_12.md diff --git a/Challenges/challenge_12.md b/Challenges/challenge_12.md new file mode 100644 index 000000000..8835fee4d --- /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 susing 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. From e9a4f88b1f7e010ce9aaf38e188622d0225627b7 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 12 Sep 2022 13:30:14 +0530 Subject: [PATCH 17/31] Update challenge_12.md Signed-off-by: Shubhansu kumar --- Challenges/challenge_12.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge_12.md b/Challenges/challenge_12.md index 8835fee4d..c08629ea4 100644 --- a/Challenges/challenge_12.md +++ b/Challenges/challenge_12.md @@ -9,6 +9,6 @@ So focus for this challenge will be to practice the ``git rebase`` command. We s 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 susing git rebase in your local projects +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. From 7850d2541f6a2813fc31b15bb1f1fd14644ff932 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 13 Sep 2022 12:47:01 +0530 Subject: [PATCH 18/31] Create challenge_13.md Signed-off-by: Shubhansu kumar --- Challenges/challenge_13.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Challenges/challenge_13.md diff --git a/Challenges/challenge_13.md b/Challenges/challenge_13.md new file mode 100644 index 000000000..b683be82f --- /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. Remove the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge From fc0219e2679d8c34e74dc77cb1d520d5987819a3 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 13 Sep 2022 12:47:21 +0530 Subject: [PATCH 19/31] Update challenge_13.md Signed-off-by: Shubhansu kumar --- Challenges/challenge_13.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge_13.md b/Challenges/challenge_13.md index b683be82f..9744d811a 100644 --- a/Challenges/challenge_13.md +++ b/Challenges/challenge_13.md @@ -7,4 +7,4 @@ Today's challenge involves how to use ``git stash`` command effectively. You can 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. Remove the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge +3. Delete the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge From 3c80ae12b1906bf75fe529d030630d1abde5514d Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Wed, 14 Sep 2022 12:56:37 +0530 Subject: [PATCH 20/31] Create challenge_14.md Signed-off-by: Shubhansu kumar --- Challenges/challenge_14.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Challenges/challenge_14.md 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. From ef45c1318f9ac2cbe42b04d4cf89af768affa021 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 15 Sep 2022 12:19:59 +0530 Subject: [PATCH 21/31] Challenge15 Signed-off-by: Shubhansu kumar --- Challenges/challenge_15.md | 13 +++++++++++++ challengers-list.md | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 Challenges/challenge_15.md create mode 100644 challengers-list.md diff --git a/Challenges/challenge_15.md b/Challenges/challenge_15.md new file mode 100644 index 000000000..4cb9c3beb --- /dev/null +++ b/Challenges/challenge_15.md @@ -0,0 +1,13 @@ +## 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. + +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/challengers-list.md b/challengers-list.md new file mode 100644 index 000000000..47394f4f2 --- /dev/null +++ b/challengers-list.md @@ -0,0 +1,3 @@ +# List of challengers +1. [Mrinal](https://github.com/mrinal1224) +2. [Shivay](https://github.com/shivaylamba) From 1f3d1e82274690729926653d58ae25b8c66481d3 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 15 Sep 2022 12:20:29 +0530 Subject: [PATCH 22/31] small update Signed-off-by: Shubhansu kumar --- Challenges/challenge_15.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Challenges/challenge_15.md b/Challenges/challenge_15.md index 4cb9c3beb..5e12e937a 100644 --- a/Challenges/challenge_15.md +++ b/Challenges/challenge_15.md @@ -4,6 +4,8 @@ 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 From 5e32f876a73abd3f0288c9c77226dcf02567e601 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 16 Sep 2022 12:21:01 +0530 Subject: [PATCH 23/31] add new challenger Signed-off-by: Shubhansu kumar --- challengers-list.md | 1 + 1 file changed, 1 insertion(+) diff --git a/challengers-list.md b/challengers-list.md index 47394f4f2..2fb6f60ea 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,3 +1,4 @@ # List of challengers 1. [Mrinal](https://github.com/mrinal1224) 2. [Shivay](https://github.com/shivaylamba) +3. [Raghav](https://github.com/raghavdhingra) From 3e6b596abcebed463eff9dfd04a72486dc340a45 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 16 Sep 2022 12:22:46 +0530 Subject: [PATCH 24/31] add challenge 16 Signed-off-by: Shubhansu kumar --- Challenges/challenge_16.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Challenges/challenge_16.md diff --git a/Challenges/challenge_16.md b/Challenges/challenge_16.md new file mode 100644 index 000000000..6d89c448d --- /dev/null +++ b/Challenges/challenge_16.md @@ -0,0 +1,14 @@ +## Welcome to Challenge 16 + +Welcome to the 16th Challenge + +In this 2 part challenge, we will try to emulate and fix merge conflicts via git. + +Today is the second and final part of this challenge: + +Task: +1. You will notice that your pull request will have a conflict: image + +2. Try to resolve this merge conflict using local git + +3. Once resolved, share screenshot on the github issue created in the previous challenges \ No newline at end of file From 7a21601ef3c1e930781bc9763bdfd62e7e7d2ce2 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sat, 17 Sep 2022 12:29:10 +0530 Subject: [PATCH 25/31] challenge 17 Signed-off-by: Shubhansu kumar --- Challenges/challenge_17.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Challenges/challenge_17.md diff --git a/Challenges/challenge_17.md b/Challenges/challenge_17.md new file mode 100644 index 000000000..9ecc318d0 --- /dev/null +++ b/Challenges/challenge_17.md @@ -0,0 +1,19 @@ +## Welcome to Challenge 17 + +Welcome to the 17th Challenge + +Today we will be leaning how to work with GitHub Desktop + +#### Brief Overview + +GitHub Desktop is a GUI that empowers *lazy* users who prefer not to work with the CLI to still interface with Git and GitHub. +To learn more visit: [What the heck is Git GUI](https://help.github.com/en/desktop/getting-started-with-github-desktop) + + +## Tasks + +- Download GitHub desktop +- Create a new repository on GitHub +- Add anything you want to your repo +- Follow through all the GitHub workflow you know using the GUI (commit, branching, pulling, pushing etc) +- Share a screenshot of your experience using github desktop on the issue created in prior challenges \ No newline at end of file From e15a76e9baa0d820d69391a4f26ff2184729a8fb Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sun, 18 Sep 2022 11:28:35 +0530 Subject: [PATCH 26/31] challenge 18 Signed-off-by: Shubhansu kumar --- Challenges/challenge_18.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Challenges/challenge_18.md diff --git a/Challenges/challenge_18.md b/Challenges/challenge_18.md new file mode 100644 index 000000000..974cb3f9c --- /dev/null +++ b/Challenges/challenge_18.md @@ -0,0 +1,22 @@ +## Welcome to Challenge 18 + +Welcome to the 18th Challenge + +Today we will be learning to work with GitHub Gist and Markdown + +#### Brief Overview + +GitHub Gist is two fold and you can either use it for sharing ideas or sharing smaple code. It supports **Markdown** +To learn more, vist: +- [Learn more about GitHub gist](https://help.github.com/en/enterprise/2.13/user/articles/about-gists) + +## Task + +- Create a gist writing on any software development related topic that interests you +- Create a gist sharing a small code snippet in your preferred programming language + +## How to Submit + +- Create your submission a markdown file named ``gist-solutions.md`` and add it inside the branch ``your-username-details`` used in previous challenges +- In your submission file add the links to your **2 gist** +- Ensure you push it so that it reflects inside your Pull request created in previous challenges \ No newline at end of file From cc36c6015e413c4b258ebaff6b2f5985b8b25afe Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 19 Sep 2022 12:58:57 +0530 Subject: [PATCH 27/31] challenge 19 - 1 Signed-off-by: Shubhansu kumar --- .github/workflows/linter.yaml | 38 +++++++++++++++++++++++++++++++++++ Challenges/challenge_19.md | 12 +++++++++++ 2 files changed, 50 insertions(+) create mode 100644 .github/workflows/linter.yaml create mode 100644 Challenges/challenge_19.md diff --git a/.github/workflows/linter.yaml b/.github/workflows/linter.yaml new file mode 100644 index 000000000..63c50dc4d --- /dev/null +++ b/.github/workflows/linter.yaml @@ -0,0 +1,38 @@ +name: Lint Code Base + +on: + push: + branches-ignore: [master, main] + # Remove the line above to run when pushing to master + pull_request: + branches: [master, main] + +jobs: + build: + # Name the Job + name: Lint Code Base + # Set the agent to run on + runs-on: ubuntu-latest + + ################## + # Load all steps # + ################## + steps: + ########################## + # Checkout the code base # + ########################## + - name: Checkout Code + uses: actions/checkout@v3 + with: + # Full git history is needed to get a proper list of changed files within `super-linter` + fetch-depth: 0 + + ################################ + # Run Linter against code base # + ################################ + - name: Lint Code Base + uses: github/super-linter@v4 + env: + VALIDATE_ALL_CODEBASE: false + DEFAULT_BRANCH: master + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/Challenges/challenge_19.md b/Challenges/challenge_19.md new file mode 100644 index 000000000..acdac3b83 --- /dev/null +++ b/Challenges/challenge_19.md @@ -0,0 +1,12 @@ +## Welcome to Challenge 19 + +Welcome to the 19th Challenge + +Today's challenge is unique. Today we will learn about code linting. A linter is defined as follows: +- Lint, or a linter, is a static code analysis tool used to flag programming errors, bugs, stylistic errors and suspicious constructs. + +So in order to ensure proper codestyling and structure, there are checks run on pull requests to ensure the code is properly linted. We have also placed a code linter Github action which will keep a track whether your code is properly linted or not. + +Task: +1. Create a new file inside your branch created in previous challenges ``your-username-details`` under the directory ``contributors/username``. The file needs to be a source code file written in your preferred programming language. The code can be anything you want: hello world program or your favorite program. +2. Commit the change and push it. From 6d1a4ca322da7ccfdf7537d3f92315058cce619d Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 19 Sep 2022 13:03:54 +0530 Subject: [PATCH 28/31] Update challenge_19.md Signed-off-by: Shubhansu kumar --- Challenges/challenge_19.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Challenges/challenge_19.md b/Challenges/challenge_19.md index acdac3b83..a8017b62d 100644 --- a/Challenges/challenge_19.md +++ b/Challenges/challenge_19.md @@ -10,3 +10,4 @@ So in order to ensure proper codestyling and structure, there are checks run on Task: 1. Create a new file inside your branch created in previous challenges ``your-username-details`` under the directory ``contributors/username``. The file needs to be a source code file written in your preferred programming language. The code can be anything you want: hello world program or your favorite program. 2. Commit the change and push it. +3. Check if your linting fails in side the Pull request: image then lint your code to ensure that this check passes inside your pull request. From 14ab498882ed86dc7714e3906d0999a8da9c4e31 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 19 Sep 2022 13:05:17 +0530 Subject: [PATCH 29/31] Update challenge_19.md Signed-off-by: Shubhansu kumar --- Challenges/challenge_19.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge_19.md b/Challenges/challenge_19.md index a8017b62d..b9448c8de 100644 --- a/Challenges/challenge_19.md +++ b/Challenges/challenge_19.md @@ -10,4 +10,4 @@ So in order to ensure proper codestyling and structure, there are checks run on Task: 1. Create a new file inside your branch created in previous challenges ``your-username-details`` under the directory ``contributors/username``. The file needs to be a source code file written in your preferred programming language. The code can be anything you want: hello world program or your favorite program. 2. Commit the change and push it. -3. Check if your linting fails in side the Pull request: image then lint your code to ensure that this check passes inside your pull request. +3. Check if your linting fails in side the Pull request: image
Then lint your code to ensure that this check passes inside your pull request. From 8be938bf55624122016d3f348a16153ac3088f8f Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Mon, 19 Sep 2022 15:05:02 +0530 Subject: [PATCH 30/31] Update linter.yaml Signed-off-by: Shubhansu kumar --- .github/workflows/linter.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linter.yaml b/.github/workflows/linter.yaml index 63c50dc4d..9a0d68623 100644 --- a/.github/workflows/linter.yaml +++ b/.github/workflows/linter.yaml @@ -34,5 +34,5 @@ jobs: uses: github/super-linter@v4 env: VALIDATE_ALL_CODEBASE: false - DEFAULT_BRANCH: master - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + DEFAULT_BRANCH: main + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 696ce9631929c1dbf05deedacd21b54813d84670 Mon Sep 17 00:00:00 2001 From: Shubhansu kumar Date: Sat, 24 Sep 2022 19:42:20 +0530 Subject: [PATCH 31/31] squash Signed-off-by: Shubhansu kumar --- CONTRIBUTING.md | 5 ++-- README.md | 29 +++++++++++++---------- challengers-list.md | 1 + contributors/shubhansu-kr/challenge19.js | 5 ++++ contributors/shubhansu-kr/shubhansu-kr.md | 4 ++++ 5 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 contributors/shubhansu-kr/challenge19.js create mode 100644 contributors/shubhansu-kr/shubhansu-kr.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5ed6b25df..ecf7ca149 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,9 +1,10 @@ -## Contributing Guidelines +# Contributing Guidelines Thank you for considering contributing to the repository. This guide details all the general information that one should know before contributing to the project. Please stick as close as possible to the guidelines. That way we ensure that you have a smooth experience contributing to this project. -### General Rules : +## General Rules + These are in general rules that you should be following while contributing to an Open Source project : - Be Nice, Be Respectful (BNBR) diff --git a/README.md b/README.md index 6c03e71e7..af60a9deb 100644 --- a/README.md +++ b/README.md @@ -1,57 +1,62 @@ # Scaler September Open Source Challenge - + ## What is the Scaler September Open Source Challenge? + Link for [Notion page](https://scalerdiscord.notion.site/scalerdiscord/Open-Source-September-Scaler-Discord-Community-f9306c7dc15a464ba1b6ea7ee30cdf0d). -Every day throughout September, for those who have enrolled, we will share one task.  -Participants will need to use their knowledge of Git and Github for each task, and the difficulty level of the tasks will rise daily. +Every day throughout September, for those who have enrolled, we will share one task. +Participants will need to use their knowledge of Git and GitHub for each task, and the difficulty level of the tasks will rise daily. The primary objective? To help the community become better at contributing to open source and building projects. ## Learning Outcomes -1. Learn how to contribute to open source projects. Learn the basics of creating issues, pull requests, Git and Github + +1. Learn how to contribute to open source projects. Learn the basics of creating issues, pull requests, Git and GitHub 2. Celebrate with new rewards every time you reach a milestone! ## How to participate? ### Step 1 -Accept the challenge by filling out this form: [https://bit.ly/opensourcesepbyscaler](https://bit.ly/opensourcesepbyscaler) +Accept the challenge by filling out this form: [https://bit.ly/opensourcesepbyscaler](https://bit.ly/opensourcesepbyscaler) ### Step 2 -If you haven't already, create an account on Github, and brush up on your skills in Git and Github. +If you haven't already, create an account on GitHub, and brush up on your skills in Git and GitHub. ### Step 3 -Head to the official [Scaler Open Source challenge repository](https://github.com/scaleracademy/scaler-september-open-source-challenge/). Star it. +Head to the official [Scaler Open Source challenge repository](https://github.com/scaleracademy/scaler-september-open-source-challenge/). Star it. -Keep track of the README, as a new task will be added every day. +Keep track of the README, as a new task will be added every day. -Please go through the task for that day and solve it. +Please go through the task for that day and solve it. ### Step 4 Don't forget to share your progress within the community if you want those rewards! ## Prizes + Consistency is what we're after. As a result, we have several levels or awards based on how consistently you complete the assignments. You won't be qualified for the remaining tasks of the challenge if you are unable to complete and submit a task on any given day. Here is the reward [tier list](https://scalerdiscord.notion.site/3eabe9a1900c4b8685ae55acb5c33cbe?v=001e8d4c287f4d96bae935c5d45de521). ## Contact Us + For all communications and queries, you can join our [Discord Server](https://discord.com/invite/scaler). ## Resources -1. Launch Video for the September Challenge: [Guide to Github and the Open Source Challenge](https://youtu.be/70nx_YxE56Q) + +1. Launch Video for the September Challenge: [Guide to GitHub and the Open Source Challenge](https://youtu.be/70nx_YxE56Q) 2. Git Tutorial: [Full Git Tutorial](https://www.youtube.com/watch?v=ZtfZGVQWjew) 3. Find good first issues to contribute to: [Good First issues](https://goodfirstissue.dev/) -4. Getting started with Github: [All you need to know about Github](https://www.youtube.com/watch?v=8WYXWs96xxc) +4. Getting started with GitHub: [All you need to know about GitHub](https://www.youtube.com/watch?v=8WYXWs96xxc) 5. How to contribute to Open Source: [Open Source contribution guide](https://www.youtube.com/watch?v=ABty2r3nDyU) diff --git a/challengers-list.md b/challengers-list.md index 2fb6f60ea..08419c34a 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,4 +1,5 @@ # List of challengers + 1. [Mrinal](https://github.com/mrinal1224) 2. [Shivay](https://github.com/shivaylamba) 3. [Raghav](https://github.com/raghavdhingra) diff --git a/contributors/shubhansu-kr/challenge19.js b/contributors/shubhansu-kr/challenge19.js new file mode 100644 index 000000000..4831a0cf1 --- /dev/null +++ b/contributors/shubhansu-kr/challenge19.js @@ -0,0 +1,5 @@ +const greet = () => { + console.log('Hello Scalar') +} + +setInterval(greet, 1000) diff --git a/contributors/shubhansu-kr/shubhansu-kr.md b/contributors/shubhansu-kr/shubhansu-kr.md new file mode 100644 index 000000000..d4ebe55c8 --- /dev/null +++ b/contributors/shubhansu-kr/shubhansu-kr.md @@ -0,0 +1,4 @@ +--- +name: Shubhansu kumar singh +github_user_name: shubhansu-kr +--- \ No newline at end of file