From 1acfd2b161d664160b97781645248d59e916a5e3 Mon Sep 17 00:00:00 2001 From: Sankhadip Das Date: Mon, 4 Sep 2023 02:45:21 +0530 Subject: [PATCH 01/35] Add .gitignore file to exclude unnecessary files Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- .gitignore | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..f7386ee56 --- /dev/null +++ b/.gitignore @@ -0,0 +1,44 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg + +# IDE-specific files and directories +.idea/ + +# Environment-specific files +.env +venv/ +.vscode/ + +# Jupyter Notebook +.ipynb_checkpoints + +# Logs and databases +*.log +*.sqlite3 + +# OS-generated files +.DS_Store +Thumbs.db From 23b87fa7947eeb38afa57185777f86e0f5f99972 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Mon, 4 Sep 2023 11:22:09 +0530 Subject: [PATCH 02/35] update challenge 4 Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge4.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 Challenges/challenge4.md diff --git a/Challenges/challenge4.md b/Challenges/challenge4.md new file mode 100644 index 000000000..4dacb31ab --- /dev/null +++ b/Challenges/challenge4.md @@ -0,0 +1,18 @@ +## Welcome to Challenge 4 + +Welcome to the fourth challenge for the Open Source September Challenge. +Today's challenge is to cover how to Update the Forked Repo From the Original Repo. + + +The main repository has been updated since the last fork that all of you created. The goal is to update the forked repository with the changes made in the original repository. This can be done with the git command of ``git remote add upstream`` + +Resources: +1. Learn about syncing a fork [here](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork) + +2. Learn about how to configure a remote for a fork [here](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork) + + +Task +1. Update your forked repository locally with the content of the [original repository](https://github.com/scaleracademy/scaler-open-source-september-challenge) 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-open-source-september-challenge/blob/main/Challenges/challenge1.md). The comment should have the following: +- Screenshot showing the latest repository contents of your forked clone repository locally \ No newline at end of file From 32b89329299c06c74825ef3303178ba07b8b0a0d Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Tue, 5 Sep 2023 11:10:40 +0530 Subject: [PATCH 03/35] challlenge 5 Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge5.md | 44 ++++++++++++++++++++++++ contributors /shivaylamba/shivaylamba.md | 4 +++ 2 files changed, 48 insertions(+) create mode 100644 Challenges/challenge5.md create mode 100644 contributors /shivaylamba/shivaylamba.md diff --git a/Challenges/challenge5.md b/Challenges/challenge5.md new file mode 100644 index 000000000..b1629ed21 --- /dev/null +++ b/Challenges/challenge5.md @@ -0,0 +1,44 @@ +## Welcome to Challenge 5 + +Welcome to the fifth challenge! +Today's goal is to update your forked repository and then create a Pull Request + + +### Pre-requisite: +1. You should have completed [Challenge 4](https://github.com/scaleracademy/scaler-open-source-september-challenge) before starting this challenge. That means ensure your forked repository is in sync with the latest changes in the main challenge repository. Also ensure that the new branch that you created in [Challenge 2](https://github.com/scaleracademy/scaler-open-source-september-challenge/blob/main/Challenges/challenge2.md) is also in sync with the latest changes in main challenge repository. + +### Resources: +1. Learn about creating a Pull Request [here](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request) +2. Learn about creating a Pull Request from a forked repository [here](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork) +3. Learn about creating a Pull Request from a branch [here](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request#creating-the-pull-request) +4. Learn about creating a Pull Request from a forked repository and branch [here](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork#creating-the-pull-request) + + + +### Task + +1. Sync your local forked repo - both the main branch and the branch you created with the latest changes from the remote main repository (https://github.com/scaleracademy/scaler-open-source-september-challenge) since the main repository has been updated since challenge 4. + +2. In your local forked repository, ensure you are currently in the branch that you created in [Challenge 2](https://github.com/scaleracademy/scaler-open-source-september-challenge/blob/main/Challenges/challenge2.md). If not, switch to that branch. + +3. Create a new directory inside the `contributors` folder (this should appear if you have correctly synced with the main repository), and give it the name of your github username. It should look something like this `contributors//`. Ex. + +``` +contributors/shivaylamba/ +``` + +4. Create a markdown file in the directory you created following the naming convention for the file: `.md`. Ex. + +``` +contributors/shivaylamba/shivaylamba.md +``` + +5. 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 +--- +``` +6. Submit your Pull Request on the main challenge repository. \ 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 4f741991e661a297e02485e89f89414a0356a30d Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 5 Sep 2023 11:29:30 +0530 Subject: [PATCH 04/35] Update challenge5.md Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge5.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Challenges/challenge5.md b/Challenges/challenge5.md index b1629ed21..be2ac3496 100644 --- a/Challenges/challenge5.md +++ b/Challenges/challenge5.md @@ -41,4 +41,9 @@ name: your_name github_user_name: YOUR-GITHUB-USERNAME --- ``` -6. Submit your Pull Request on the main challenge repository. \ No newline at end of file +6. Submit your Pull Request on the main challenge repository. + + + +### Note +You should also sync your fork on GitHub. After you have synced your local forked repository with the latest changes from the remote main repository, you should push these changes to your fork on GitHub to ensure that your online fork is also up to date. This step is important to make sure your online repository reflects the changes from the main repository before you create a Pull Request in the current challenge. So, both your local and online forks should be in sync with the main repository. From 153c3493fb0da62517e999c2e126e63a52564571 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Tue, 5 Sep 2023 11:39:06 +0530 Subject: [PATCH 05/35] updated file path Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- {contributors => contributors}/shivaylamba/shivaylamba.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {contributors => contributors}/shivaylamba/shivaylamba.md (100%) diff --git a/contributors /shivaylamba/shivaylamba.md b/contributors/shivaylamba/shivaylamba.md similarity index 100% rename from contributors /shivaylamba/shivaylamba.md rename to contributors/shivaylamba/shivaylamba.md From d4429286e3ddb396950d91c33f1bf155e4e42055 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 5 Sep 2023 12:28:59 +0530 Subject: [PATCH 06/35] typo fix Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge5.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge5.md b/Challenges/challenge5.md index be2ac3496..7fc392c0c 100644 --- a/Challenges/challenge5.md +++ b/Challenges/challenge5.md @@ -5,7 +5,7 @@ Today's goal is to update your forked repository and then create a Pull Request ### Pre-requisite: -1. You should have completed [Challenge 4](https://github.com/scaleracademy/scaler-open-source-september-challenge) before starting this challenge. That means ensure your forked repository is in sync with the latest changes in the main challenge repository. Also ensure that the new branch that you created in [Challenge 2](https://github.com/scaleracademy/scaler-open-source-september-challenge/blob/main/Challenges/challenge2.md) is also in sync with the latest changes in main challenge repository. +1. You should have completed [Challenge 4](https://github.com/scaleracademy/scaler-open-source-september-challenge) before starting this challenge. That means ensure your forked repository is in sync with the latest changes in the main challenge repository. Also, ensure that the new branch that you created in [Challenge 3](https://github.com/scaleracademy/scaler-open-source-september-challenge/blob/main/Challenges/challenge3.md) is also in sync with the latest changes in main challenge repository. ### Resources: 1. Learn about creating a Pull Request [here](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request) From 9d15a277e888c5e4e9d8141ec797e237142376ed Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 5 Sep 2023 13:30:02 +0530 Subject: [PATCH 07/35] Update challenge5.md Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge5.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge5.md b/Challenges/challenge5.md index 7fc392c0c..ee827842a 100644 --- a/Challenges/challenge5.md +++ b/Challenges/challenge5.md @@ -41,7 +41,7 @@ name: your_name github_user_name: YOUR-GITHUB-USERNAME --- ``` -6. Submit your Pull Request on the main challenge repository. +6. Submit your Pull Request on the main challenge repository: i.e. https://github.com/scaleracademy/scaler-open-source-september-challenge . From 4a8935cc78ee7b8e4d8c735da88648f5858f47f0 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Wed, 6 Sep 2023 11:18:01 +0530 Subject: [PATCH 08/35] challenge 6 Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge6.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Challenges/challenge6.md diff --git a/Challenges/challenge6.md b/Challenges/challenge6.md new file mode 100644 index 000000000..5573cc073 --- /dev/null +++ b/Challenges/challenge6.md @@ -0,0 +1,23 @@ +## 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-open-source-september-challenge/blob/main/Challenges/challenge5.md) + +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 +--- +``` +Note: The url_of_github_issue should be the link of the github issue that you created in Challenge 1. + +3. After making this change create a commit with a proper commit message and push the changes to your forked repository +4. Check if the commit reflects in the Pull request you created in Challenge 5 in the main challenge repository. + +( If it does not, then sync your forked repository with the main repository and push the changes to your forked repository.) From 6a722330149a0634f1d3e08061ec233ad47a116d Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Thu, 7 Sep 2023 11:41:38 +0530 Subject: [PATCH 09/35] challenge 7 Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge7.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Challenges/challenge7.md diff --git a/Challenges/challenge7.md b/Challenges/challenge7.md new file mode 100644 index 000000000..f523e0d13 --- /dev/null +++ b/Challenges/challenge7.md @@ -0,0 +1,23 @@ +## Welcome to Challenge 7 + +Welcome to the 7th challenge! Today we will learn about the concept of Git Reset. + +Today's the task focus is to create an additional commit in your branch. And then 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. Inside the branch you created during the prior challenges in your local 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 markdown file and push the change to your forked repository. + +2. Ensure the change appears in the Pull request created in previous challenges + +3. Identify the commit id for the commit you just made and use the git reset command to remove the commit from your local branch. Note: Use git reset and force push, to remove the commit from your pull request. + +4. Share a screenshot of this, in the issue you created in previous challenges. + +5. Update your Discord forum post you created with the Challenge 7. From 3efbe4e06173244d57fe2fd04d04a991f821c560 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Fri, 8 Sep 2023 11:46:49 +0530 Subject: [PATCH 10/35] add challenge 8 Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge8.md | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Challenges/challenge8.md diff --git a/Challenges/challenge8.md b/Challenges/challenge8.md new file mode 100644 index 000000000..ab4478feb --- /dev/null +++ b/Challenges/challenge8.md @@ -0,0 +1,35 @@ +## Welcome to Challenge 8 + +Congratulations on successfully completing the 7th challenge! This marks the completion of the first milestone of the challenge. + +Before you proceed with the 8th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 1st milestone: + +## Preqrequisites to mark completion of 1st Checkpoint (Milestone): + +1. Use the creative shared for the successful completion of the first milestone: [First Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/19529592/266515279-9696f91e-138d-44b0-b42b-08c5e679f4ac.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the first milestone. + +2. Fill the Google form the following Google form: [Google Form](https://forms.gle/n6VL2xCSeP6vgtgL6) to mark the completion of the first milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. + + +Once you have completed the above, you can proceed with the 8th challenge. + + +## Task: +Welcome to the eighth challenge! + +This is a two part challenge to cover the concepts of Git Rebase and Git Squash. + +Resources to refer to: +1. [Git Rebase](https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase) +2. [Git Squash](https://www.freecodecamp.org/news/git-squash-explained/) +3. [Git Merge](https://www.atlassian.com/git/tutorials/using-branches/git-merge) + +Step 1: Ensure you have covered all the previous challenges properly and have completed the tasks in the previous challenges. + +Step 2: Today's goal is to understand the concept of Git Rebase and Git Squash. Go through these resources to understand the concept of Git Rebase and Git Squash as this will be used in the subsequent tasks. + +Step 3: Create a new branch in your forked repository by the name of ``challenge8`` and switch to that branch. + +Step 4: Add a new file by the name of ``your-github-username-3.md`` and add any details you may want to add to this markdown file and push the change to your forked repository. + +That's it for the first part of the challenge. From 8a47488ef44c82f470c743b0861bbc25de6d24b9 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Sat, 9 Sep 2023 11:40:20 +0530 Subject: [PATCH 11/35] 9 Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge9.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Challenges/challenge9.md diff --git a/Challenges/challenge9.md b/Challenges/challenge9.md new file mode 100644 index 000000000..b45c61f32 --- /dev/null +++ b/Challenges/challenge9.md @@ -0,0 +1,19 @@ +## Welcome to Challenge 9 + +This challenge is a two part challenge to cover the concepts of Git Rebase and Git Squash and continuation of the previous challenge which is challenge 8. + + + +Task: + +1. First, make sure you are on the ``challenge8`` branch as created in the previous challenge. + +2. Create another commit by making some change in the ``your-github-username-3.md`` file and push the change to your forked repository. + +3. Now, we will use the concept of Git Rebase to squash the last two commits into one commit. +For this. Review the commits you've made on the challenge8 branch using the git log --oneline command. You should see two commits on the challenge8 branch. Use the interactive rebase command to squash the commits. + +4. In the interactive rebase editor, change the word pick to squash (or s) for the commits you want to combine. Save and close the editor. Edit the combined commit message when prompted. Force push the changes to your forked repository. + +5. Take the screenshot of the terminal when you have successfully used the git rebase to squash the commits and post it in the comment created in the first challenge (challenge 1). + From 157bd6c2372adab75a468ea721b63aaf6ef64fa0 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Sun, 10 Sep 2023 15:15:20 +0530 Subject: [PATCH 12/35] add 10th challenge Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge10.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Challenges/challenge10.md diff --git a/Challenges/challenge10.md b/Challenges/challenge10.md new file mode 100644 index 000000000..1d57c74b4 --- /dev/null +++ b/Challenges/challenge10.md @@ -0,0 +1,24 @@ +## Welcome to Challenge 10 + +Welcome to the 10th challenge! + +Today's let's try to use the concept for Git Rebase you learnt but on a Pull Request. + + +Task: +1. Checkout to the branch you created in Challenge 2 in your forked repository. + +2. Create another commit by making some change in the markdown file (``your_github_username-details.md``) you created in Challenge 3 and push the change to your forked repository. + +3. Now, we will use the concept of Git Rebase to squash the last two commits into one commit. + +4. For this. Review the commits you've made on the branch using the git log --oneline command. You should see a number of commits on the branch. Use the interactive rebase command to squash the commits. + +5. In the interactive rebase editor, change the word pick to squash (or s) for the commits you want to combine. Save and close the editor. Edit the combined commit message when prompted. Force push the changes to your forked repository. + +6. Check if the commit reflects in the Pull request you created in Challenge 5 in the main challenge repository. + +( If it does not, then sync your forked repository with the main repository and push the changes to your forked repository.) + +7. Take the screenshot of the terminal when you have successfully used the git rebase to squash the commits and post it in the comment created in the first challenge (challenge 1). + From 0d92421d764e8238ac6d1b211d86a6d2a79cf8ba Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sun, 10 Sep 2023 16:32:08 +0530 Subject: [PATCH 13/35] Update challenge10.md Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge10.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge10.md b/Challenges/challenge10.md index 1d57c74b4..e541f6529 100644 --- a/Challenges/challenge10.md +++ b/Challenges/challenge10.md @@ -6,7 +6,7 @@ Today's let's try to use the concept for Git Rebase you learnt but on a Pull Req Task: -1. Checkout to the branch you created in Challenge 2 in your forked repository. +1. Checkout to the branch you created in Challenge 3 in your forked repository. 2. Create another commit by making some change in the markdown file (``your_github_username-details.md``) you created in Challenge 3 and push the change to your forked repository. From f9861bb8eae9c38cf2bcdd5a20f6aeeafe7fe27c Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sun, 10 Sep 2023 16:33:06 +0530 Subject: [PATCH 14/35] Update challenge10.md Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge10.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge10.md b/Challenges/challenge10.md index e541f6529..806fdacfd 100644 --- a/Challenges/challenge10.md +++ b/Challenges/challenge10.md @@ -8,7 +8,7 @@ Today's let's try to use the concept for Git Rebase you learnt but on a Pull Req Task: 1. Checkout to the branch you created in Challenge 3 in your forked repository. -2. Create another commit by making some change in the markdown file (``your_github_username-details.md``) you created in Challenge 3 and push the change to your forked repository. +2. Create another commit by making some change in the markdown file (``your_github_username-details.md``) you created in Challenge 5 and push the change to your forked repository. 3. Now, we will use the concept of Git Rebase to squash the last two commits into one commit. From 9cdeb6d7c06e9632aa02da9ebe6007a91feead03 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Sun, 10 Sep 2023 16:55:47 +0530 Subject: [PATCH 15/35] update #2 Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge10.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge10.md b/Challenges/challenge10.md index 806fdacfd..6840ff7aa 100644 --- a/Challenges/challenge10.md +++ b/Challenges/challenge10.md @@ -8,7 +8,7 @@ Today's let's try to use the concept for Git Rebase you learnt but on a Pull Req Task: 1. Checkout to the branch you created in Challenge 3 in your forked repository. -2. Create another commit by making some change in the markdown file (``your_github_username-details.md``) you created in Challenge 5 and push the change to your forked repository. +2. Create another commit by making some change in the markdown file (`.md`) you created in Challenge 5 and push the change to your forked repository. 3. Now, we will use the concept of Git Rebase to squash the last two commits into one commit. From dbbfd853fe889681f144a9836dd7f5e8dc8f7cd5 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Mon, 11 Sep 2023 11:15:18 +0530 Subject: [PATCH 16/35] 11 Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge11.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Challenges/challenge11.md diff --git a/Challenges/challenge11.md b/Challenges/challenge11.md new file mode 100644 index 000000000..724b4a01c --- /dev/null +++ b/Challenges/challenge11.md @@ -0,0 +1,11 @@ +## Welcome to Challenge 11 + +Welcome to the 11th 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 (challenge 3) ``your_github_username-details`` create a new file inside the directory ``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. + From 3d54b4e0d583a5d82c58abd274ea33748fe2747c Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Tue, 12 Sep 2023 01:22:58 +0530 Subject: [PATCH 17/35] add challenge 12 Signed-off-by: shivaylamba Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge12.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Challenges/challenge12.md diff --git a/Challenges/challenge12.md b/Challenges/challenge12.md new file mode 100644 index 000000000..381f1804a --- /dev/null +++ b/Challenges/challenge12.md @@ -0,0 +1,22 @@ +## Welcome to Challenge 12 + +Welcome to the 12th 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 ``.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 +--- +``` \ No newline at end of file From 09289b9d46ad479052f6c052f8991fd842b54ae0 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Wed, 13 Sep 2023 11:03:53 +0530 Subject: [PATCH 18/35] challenge 13 Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge13.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 Challenges/challenge13.md diff --git a/Challenges/challenge13.md b/Challenges/challenge13.md new file mode 100644 index 000000000..318f24414 --- /dev/null +++ b/Challenges/challenge13.md @@ -0,0 +1,26 @@ +## Welcome to Challenge 13th + +Welcome to the 13th Challenge + +Today we will be learning to work with GitHub Gists. + +Github Gists are a great way to share ideas and code snippets with others. + +#### 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_github_username-details`` used in previous challenges +- In your submission file add the links to your **2 gists** +- Ensure you push it so that it reflects inside your Pull request created in previous challenges + +Do remember to update your forum post on Discord with today's task completion and screenshot \ No newline at end of file From 388f9a9854fa2b493cfd9ceb701b399c00d5e3c4 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Thu, 14 Sep 2023 11:19:30 +0530 Subject: [PATCH 19/35] add challenge 14 Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge14.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Challenges/challenge14.md diff --git a/Challenges/challenge14.md b/Challenges/challenge14.md new file mode 100644 index 000000000..7802e4986 --- /dev/null +++ b/Challenges/challenge14.md @@ -0,0 +1,14 @@ +## Welcome to Challenge 12 + +Welcome to the 12th Challenge + +Today's challenge is a re-practice of the 8th and 9th Challenge. + +So focus for this challenge will be to practice the ``git rebase`` command. + +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. For this you can make some changes in the branch and the file created in Challenge 3 & 5. +2. Once done, try to squash the commits in your pull request in the Challenge repository. +3. Also do sign your commits, covered in the Challenge 12. \ No newline at end of file From 1a77ba524a762a2da3b819e1ad5f5df4143652ac Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 14 Sep 2023 11:20:25 +0530 Subject: [PATCH 20/35] Update challenge14.md Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge14.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Challenges/challenge14.md b/Challenges/challenge14.md index 7802e4986..09af080d9 100644 --- a/Challenges/challenge14.md +++ b/Challenges/challenge14.md @@ -1,6 +1,6 @@ -## Welcome to Challenge 12 +## Welcome to Challenge 14 -Welcome to the 12th Challenge +Welcome to the 14th Challenge Today's challenge is a re-practice of the 8th and 9th Challenge. @@ -11,4 +11,4 @@ Ensure to practice the ``git rebase`` command by creating your own local git rep Task: 1. Practice git rebase, and how to squash commit using git rebase in your local projects. For this you can make some changes in the branch and the file created in Challenge 3 & 5. 2. Once done, try to squash the commits in your pull request in the Challenge repository. -3. Also do sign your commits, covered in the Challenge 12. \ No newline at end of file +3. Also do sign your commits, covered in the Challenge 12. From 99d9bcfbbf855d98bc5dff77d4ea4f7ae3719572 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 15 Sep 2023 09:46:49 +0530 Subject: [PATCH 21/35] Create challenge15.md Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge15.md | 151 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 Challenges/challenge15.md diff --git a/Challenges/challenge15.md b/Challenges/challenge15.md new file mode 100644 index 000000000..61c165e48 --- /dev/null +++ b/Challenges/challenge15.md @@ -0,0 +1,151 @@ +## Welcome to Challenge 15 + +Congratulations on successfully completing the 14th challenge! This marks the completion of the second milestone of the challenge. + +Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 1st milestone: + +## Preqrequisites to mark completion of 1st Checkpoint (Milestone): + +1. Use the creative shared for the successful completion of the first milestone: [Second Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/129844674/268165917-34df9c63-be61-4ffc-af43-264703f89f0a.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the first milestone. + +2. Fill the Google form the following Google form: [Google Form](https://forms.gle/JnzBURSEjRejEgw4A) to mark the completion of the first milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. + + +Once you have completed the above, you can proceed with the 15th challenge. + + +## Task: +Welcome to the 15th challenge! + +Read this [article on merge conflicts](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) as it is very important. + +Today is the first part of a two-part challenge related to resolving merge conflicts. To get started, follow these steps: + +Task: +Create a Scenario for Merge Conflict: + +- Create a new project on your local system (e.g., a code project or a text file). + +- Intentionally make changes to the same lines of code or content in different branches of your project to create a scenario where a merge conflict would occur during a merge or pull request. +Resolve the Merge Conflict: + +- Follow the steps outlined in this [article](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) to understand how to resolve merge conflicts. + +- Use the techniques mentioned in the article to resolve the conflict you intentionally created in your project. + +- Share Screenshot: Take a screenshot of your terminal or Git client when you are resolving the merge conflict. + +- Share this screenshot in the issue you created during the first challenge (Challenge 1) to demonstrate that you have successfully resolved a merge conflict. + +- By completing this challenge, you'll gain valuable experience in dealing with merge conflicts, a common occurrence in collaborative Git projects. + + +### Sample Example for merge conflict +Here is an example of a merge conflict: + + +Step 1: Set Up Your Repository +a. Create a new directory on your computer for your Git project: + +``` +mkdir merge-conflict-example +cd merge-conflict-example +``` + +b. Initialize the directory as a Git repository: + +``` +git init +``` + +Step 2: Create Two Branches +a. Create a new branch called feature-branch: + + ``` + git checkout -b feature-branch + + ``` +b. Create a file and make some changes in it. For example, create a file named example.txt and add the following content: + +``` +This is some content on the feature branch. +``` + +c. Stage and commit your changes: + +``` +git add example.txt +git commit -m "Add feature branch content" + +``` +d. Switch back to the main (or master) branch: + +``` +git checkout main +``` +e. Make changes to the same file, example.txt, in the main branch. For example: + +``` +This is some content on the main branch. +``` + +f. Stage and commit your changes on the main branch: +``` +git add example.txt +git commit -m "Add main branch content" +``` + +Step 3: Create a Merge Conflict +a. Attempt to merge the feature-branch into main: + +``` +git merge feature-branch +``` + +At this point, you'll encounter a merge conflict because both branches have made changes to the same part of the example.txt file. + + +Step 4: Resolve the Merge Conflict +a. Open the example.txt file in your code editor. + +b. You'll see Git's conflict markers, which look like this: + +``` +<<<<<<< HEAD +This is some content on the main branch. +======= +This is some content on the feature branch. +>>>>>>> feature-branch +``` + +c. Manually edit the file to decide which changes to keep. Remove the conflict markers and choose the content you want to keep. For example: + +``` +This is some content on the main branch. + +This is some additional content on the feature branch. +``` + +d. Save the file. + + +Step 5: Commit the Resolved Merge Conflict +a. Stage the resolved file: + +``` +git add example.txt +``` + +b. Commit the changes: + +``` +git commit -m "Resolve merge conflict" +``` + +Now, you've successfully created a scenario for a merge conflict, resolved it, and committed the changes. You can use these steps as a practical exercise to understand how merge conflicts work in Git. + + + + + + From ca8e8b28233308189fc355a86f81db32a59b6f06 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 15 Sep 2023 09:47:37 +0530 Subject: [PATCH 22/35] Update challenge15.md Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge15.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge15.md b/Challenges/challenge15.md index 61c165e48..ffb8360c6 100644 --- a/Challenges/challenge15.md +++ b/Challenges/challenge15.md @@ -37,7 +37,7 @@ Resolve the Merge Conflict: - Share this screenshot in the issue you created during the first challenge (Challenge 1) to demonstrate that you have successfully resolved a merge conflict. -- By completing this challenge, you'll gain valuable experience in dealing with merge conflicts, a common occurrence in collaborative Git projects. + ### Sample Example for merge conflict From fefe257c30f1684a9d236b304557ea40687333ec Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 15 Sep 2023 09:49:15 +0530 Subject: [PATCH 23/35] Update challenge15.md Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge15.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Challenges/challenge15.md b/Challenges/challenge15.md index ffb8360c6..5085e1976 100644 --- a/Challenges/challenge15.md +++ b/Challenges/challenge15.md @@ -4,11 +4,11 @@ Congratulations on successfully completing the 14th challenge! This marks the co Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 1st milestone: -## Preqrequisites to mark completion of 1st Checkpoint (Milestone): +## Preqrequisites to mark completion of 2nd Checkpoint (Milestone): -1. Use the creative shared for the successful completion of the first milestone: [Second Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/129844674/268165917-34df9c63-be61-4ffc-af43-264703f89f0a.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the first milestone. +1. Use the creative shared for the successful completion of the second milestone: [Second Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/129844674/268165917-34df9c63-be61-4ffc-af43-264703f89f0a.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the second milestone. -2. Fill the Google form the following Google form: [Google Form](https://forms.gle/JnzBURSEjRejEgw4A) to mark the completion of the first milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. +2. Fill the Google form the following Google form: [Google Form](https://forms.gle/JnzBURSEjRejEgw4A) to mark the completion of the second milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. Once you have completed the above, you can proceed with the 15th challenge. From 439167899a1b8b9a83f95466629a7d40de4d5569 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 15 Sep 2023 09:49:28 +0530 Subject: [PATCH 24/35] Update challenge15.md Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge15.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge15.md b/Challenges/challenge15.md index 5085e1976..650b5cbb0 100644 --- a/Challenges/challenge15.md +++ b/Challenges/challenge15.md @@ -2,7 +2,7 @@ Congratulations on successfully completing the 14th challenge! This marks the completion of the second milestone of the challenge. -Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 1st milestone: +Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 2nd milestone: ## Preqrequisites to mark completion of 2nd Checkpoint (Milestone): From 38caab497cab39c68a05f23f4a2d7197bd2a1650 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sat, 16 Sep 2023 11:32:08 +0530 Subject: [PATCH 25/35] Create challenge16.md Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge16.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Challenges/challenge16.md diff --git a/Challenges/challenge16.md b/Challenges/challenge16.md new file mode 100644 index 000000000..6a96d3e9a --- /dev/null +++ b/Challenges/challenge16.md @@ -0,0 +1,31 @@ +## Welcome to Challenge 16 + +Welcome to the 16th Challenge + + +Before taking part. Fill out the Google Form to officially submit your progress for Checkpoint 2 in the challenge: https://forms.gle/JnzBURSEjRejEgw4A + + +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. Sync Your Repository: + +- Update your Forked Repository From the Original [Main Repository](https://github.com/scaleracademy/scaler-open-source-september-challenge) locally. Also ensure that your branch ``your_github_username-details`` is also synced with the latest changes from the original repository. + +2. In your branch ``your_github_username-details`` open the ``challengers-list.md`` file. +Add your name to the list of challengers, following the format specified in the file. + + +3. Push your changes to reflect them in the Pull Request created in previous challenges. +Please note that by adding your name to the same file in a collaborative environment, this task may create a merge conflict when multiple participants attempt to push their changes simultaneously. Be prepared to resolve any conflicts that arise. + + +4. Add a new comment to the issue you created in the first task with the screenshot of the updated ``challengers-list.md`` file in your forked repository. + + + +Note: Next Challenge: Challenge 17 will focus on resolving merge conflicts. + From 211cfb907965b07a9eade8c85172a46b680489f5 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sat, 16 Sep 2023 11:32:42 +0530 Subject: [PATCH 26/35] Create challengers-list.md Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- challengers-list.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 challengers-list.md diff --git a/challengers-list.md b/challengers-list.md new file mode 100644 index 000000000..55587c56c --- /dev/null +++ b/challengers-list.md @@ -0,0 +1,2 @@ +# List of challengers +1. [Shivay](https://github.com/shivaylamba) From 489aa3738d8151f12fd998a06a7019f2a53cba1d Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Sun, 17 Sep 2023 10:45:30 +0530 Subject: [PATCH 27/35] chall 17 Signed-off-by: shivaylamba Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- .github/workflows/linter.yaml | 77 ++++++++++++++++++----------------- Challenges/challenge17.md | 34 ++++++++++++++++ 2 files changed, 73 insertions(+), 38 deletions(-) create mode 100644 Challenges/challenge17.md diff --git a/.github/workflows/linter.yaml b/.github/workflows/linter.yaml index 3ecf02389..b1dac57d2 100644 --- a/.github/workflows/linter.yaml +++ b/.github/workflows/linter.yaml @@ -1,38 +1,39 @@ -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: main - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file +name: Lint Code Base + + on: + push: + branches-ignore: [master, main] + # Remove the line above to run when pushing to master + pull_request: + branches: '*detail*' # Run it on details branch only + + 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: main + FILTER_REGEX_EXCLUDE: .*Challenges/.* # Ignore Challenges/ markdown files + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/Challenges/challenge17.md b/Challenges/challenge17.md new file mode 100644 index 000000000..05b35b37f --- /dev/null +++ b/Challenges/challenge17.md @@ -0,0 +1,34 @@ +## Welcome to Challenge 17 + +Welcome to the 17th Challenge + + +NOTE: +Before taking part. Fill out the 2nd milestone Google Form (if haven't already) to officially submit your progress for Checkpoint 2 in the challenge: https://forms.gle/JnzBURSEjRejEgw4A + + +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. Navigate to your Pull Request (PR) created in previous challenges.You will notice that your PR has a conflict, indicated with a message similar to the one shown below: image + + +2. Try to resolve this merge conflict using local git +- Open the conflicted file(s) in your code editor. Git will mark the conflicting sections. + +- Manually edit the file to resolve the conflict by choosing which changes to keep. + +- Save the file. + +- Stage the resolved files by running `git add` after you have edited the files. + +- Commit the changes with a message that indicates you've resolved the conflict. + +- Push the changes to your remote repository. + +3. Once resolved, share screenshot on the github issue created in the previous challenges + + +Note: for this challenge, you can follow this guide: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line \ No newline at end of file From be6df95200ef93df688dd0cbaf4961f5e0ceab2a Mon Sep 17 00:00:00 2001 From: shivscaler <129844674+shivscaler@users.noreply.github.com> Date: Sun, 17 Sep 2023 10:58:15 +0530 Subject: [PATCH 28/35] Update challengers-list.md Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- challengers-list.md | 1 + 1 file changed, 1 insertion(+) diff --git a/challengers-list.md b/challengers-list.md index 55587c56c..848dec155 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,2 +1,3 @@ # List of challengers 1. [Shivay](https://github.com/shivaylamba) +2. [shivscaler](http://github.com/shivscaler) From e6dfb469aad942f4b1669d49c3cb7750e894a878 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Mon, 18 Sep 2023 09:46:58 +0530 Subject: [PATCH 29/35] add challenge 18 Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge18.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Challenges/challenge18.md diff --git a/Challenges/challenge18.md b/Challenges/challenge18.md new file mode 100644 index 000000000..fddefe8b7 --- /dev/null +++ b/Challenges/challenge18.md @@ -0,0 +1,19 @@ +## Welcome to Challenge 18 + +Welcome to the 18th Challenge + +Being a busy Monday, today's challenge is a bit straightforward. We will be learning how to work with GitHub Desktop + +#### Brief Overview + +GitHub Desktop is a GUI that empowers users who prefer not to work with the CLI to still interface with Git and GitHub. +To learn more visit: [What 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 Challenge 1. \ No newline at end of file From ff27d8c3457dac6f47e6f8eea7542226933d4e65 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Tue, 19 Sep 2023 10:51:05 +0530 Subject: [PATCH 30/35] 19 Signed-off-by: shivaylamba Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge19.md | 46 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 Challenges/challenge19.md diff --git a/Challenges/challenge19.md b/Challenges/challenge19.md new file mode 100644 index 000000000..4a994e937 --- /dev/null +++ b/Challenges/challenge19.md @@ -0,0 +1,46 @@ +## Welcome to Challenge 19 + +Welcome to the 19th Challenge! + + +### Brief Overview +In this challenge, we will dive into the world of GitHub Codespaces, a powerful tool for development and collaboration. GitHub Codespaces allows you to code and build in an online environment, making it easier to collaborate on projects and work from anywhere. + +## Task: +1. Set Up a GitHub Codespace: + + - If you haven't already, create a GitHub repository or use an existing one that you'd like to work on. + +- Navigate to the repository's main page on GitHub. + +2. Create a Codespace: + + - Click on the "Code" button on the repository's main page. + - Select the option to "Open with Codespaces." + - Select the option to "New codespace." + - Wait for your Codespace to be created. + +3. Explore the Codespace: + +- Once your Codespace is ready, explore its features and capabilities. +- Familiarize yourself with the development environment, including code editing, terminal access, and integrated tools. +- If you're new to Codespaces, check out the [documentation](https://docs.github.com/en/github/developing-online-with-codespaces/creating-a-codespace) for more information. +- If you're already familiar with Codespaces, try out some of the features you haven't used before. + +4. Make a Change: + +- In your Codespace, make a simple code change to a file in your repository. +- Create a new branch, make a code edit, and commit the change. + +5. Push Your Changes: + +- Push the changes back to your GitHub repository from within your Codespace. +- Confirm that the changes are reflected in your GitHub repository. + +6. Share Your Experience: + +- In the GitHub issue created in Challenge 1, share your experience with GitHub Codespaces. Mention any features you found useful, challenges you encountered, and how you envision using Codespaces in your development workflow. + + +By completing this challenge, you'll gain hands-on experience with GitHub Codespaces and discover its potential for enhancing your development workflow and collaboration with others. In fact a lot of you are also facing issues with your local Git, try solving the Open Source September Challenge with Codespaces. That is, try to create a Codespace for your forked repository and explore if that helps with any of the challenges where you are stuck. + From d4bc032613113afcbe7099582465e05d55a98a73 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Wed, 20 Sep 2023 06:58:10 +0530 Subject: [PATCH 31/35] add chall 20 Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge20.md | 69 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 Challenges/challenge20.md diff --git a/Challenges/challenge20.md b/Challenges/challenge20.md new file mode 100644 index 000000000..977383dd1 --- /dev/null +++ b/Challenges/challenge20.md @@ -0,0 +1,69 @@ +## Welcome to Challenge 20 + + +Welcome to the 20th Challenge! + +Today's challenge is all about getting familiar with GitHub Actions and setting up a code linter workflow in your own repository. GitHub Actions allows you to automate various tasks, and one common use case is running code linting checks on your codebase. + +### Brief Overview +In this challenge, you'll set up a GitHub Actions workflow to run code linting checks on your codebase. You'll learn how to configure GitHub Actions to run whenever there are changes pushed to your repository. You'll also learn how to use a code linter to check your code for errors and ensure it adheres to the linting rules. + +Learn about GitHub Actions and code linting in the following resources: +1. [GitHub Actions](https://docs.github.com/en/actions) +2. [Code Linting](https://www.perforce.com/blog/qac/what-lint-code-and-what-linting-and-why-linting-important) +3. [Github Action Video on Code With Scaler Channel](https://www.youtube.com/watch?v=b_VypAwsvZI&ab_channel=CodewithScaler) +4. [How to setup Linter Github Actions for your repository](https://www.freecodecamp.org/news/github-super-linter/) + + +## Task: Set Up a GitHub Action for Code Linting +1. Create a New Repository on Github. + +2. Set Up a GitHub Action for Code Linting: + +- In your repository, navigate to the "Actions" tab. +- Select the option to "Set up a workflow yourself." +- Create a new GitHub Action workflow file. You can name it lint.yml instead of main.yml. +- Add the following code to the workflow file: +``` +name: Lint Code Base + +on: [push, pull_request] + +jobs: + build: + name: Lint Code Base + runs-on: ubuntu-latest + + steps: + + - name: Checkout Code + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Lint Code Base + uses: github/super-linter@v4 +``` +- Commit the lint.yml workflow file to your repository and push the changes. + + +3. Add a Sample Code File: + +- Inside your repository, create a new file (e.g., hello.py for Python or hello.js for JavaScript). +Write a simple code snippet in your preferred programming language. It could be a "Hello, World!" program or any code you like. + +4. Check the GitHub Actions Workflow: + +- Visit the "Actions" tab in your repository to see your newly created workflow in action. +- Observe how GitHub Actions automatically runs the code linting checks whenever there are new commits or pull requests. + +5. Ensure the Workflow Passes: + +- Make sure your code file adheres to the linting rules. If there are linting errors, fix them in your code file. + +6. Share Your Experience: + +- In the GitHub issue created in Challenge 1, share your experience with setting up GitHub Actions for code linting by sharing a screenshot of your repoistory and the workflow running. + + +By completing this challenge, you'll have hands-on experience setting up GitHub Actions for code linting, which can significantly improve your code quality and streamline your development process. \ No newline at end of file From bccf4e84043f8f093e9bb652345933821a0d2c79 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Thu, 21 Sep 2023 11:00:09 +0530 Subject: [PATCH 32/35] add chall 21 Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge21.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Challenges/challenge21.md diff --git a/Challenges/challenge21.md b/Challenges/challenge21.md new file mode 100644 index 000000000..e69de29bb From 612fc701821420ce320fc88b506183003afc8652 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Thu, 21 Sep 2023 11:11:06 +0530 Subject: [PATCH 33/35] add chall 21 Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge21.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/Challenges/challenge21.md b/Challenges/challenge21.md index e69de29bb..653c66920 100644 --- a/Challenges/challenge21.md +++ b/Challenges/challenge21.md @@ -0,0 +1,23 @@ +## Welcome to Challenge 21 + +Welcome to the 21st Challenge + +Today you will learn about project boards on GitHub + +### What are Github Project Boards? + +GitHub project boards helps you keep track of stuffs you're actively working on within your repository. You can say it's a project managemnet tool, or even a collaboration tool for teams. You create a project board with columns for your TODO or backlogs or even bugs, In progress activies and lastly a column for your finished tasks. You can sort of see it as a SCRUM board. To learn more [about project boards go through this link](https://help.github.com/en/github/managing-your-work-on-github/about-project-boards) + +## Tasks + +- Create a GitHub repository for any project you can think up +- On a sheet of paper create a TODO list (or backlog) of features you want to have in you app +- Create a project board with a `TODO` column, `In progress`, `Done` +- Create a card for all the items you already wrote on the sheet of paper in the TODO column +- Work on the features synchronously and move the card respectively for each in progress task to the `In progress` column +- When you're done with the `In progress` task move the card to the `Done` column + +## How to submit your entry + +- Take a screenshot of your project board for when you moved an card from `In progress` to `Done` +- Add you screenshot to the Github issue created in the previous challenges \ No newline at end of file From fbbe44f41cdda3c2ede0a4319e4a7a8d6c641eef Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Fri, 22 Sep 2023 11:16:50 +0530 Subject: [PATCH 34/35] 22nd Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- Challenges/challenge22.md | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 Challenges/challenge22.md diff --git a/Challenges/challenge22.md b/Challenges/challenge22.md new file mode 100644 index 000000000..d7703274b --- /dev/null +++ b/Challenges/challenge22.md @@ -0,0 +1,38 @@ +## Welcome to Challenge 22 + +Welcome to the 22nd Challenge + +Congratulations on successfully completing the 21st challenge! This marks the completion of the third milestone of the challenge. + +Before you proceed with the 22nd challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 3rd milestone: + +## Preqrequisites to mark completion of 3rd Checkpoint (Milestone): + +1. Use the creative shared for the successful completion of the third milestone: [Third Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/19529592/269840111-65c535ce-abcb-4246-8e61-c347127eebef.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the second milestone. + +2. Fill the Google form the following Google form: [Google Form](https://forms.gle/FJNAM11ajPkhXx5N6) to mark the completion of the third milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. + + +Once you have completed the above, you can proceed with the 22nd challenge. + + +## Task + +Today we will be learning about Git Aliases! :). This is an amazing feature that helps us use less keystroke + + The term alias is synonymous with a shortcut. Alias creation is a common pattern found in other popular utilities like `bash` shell. Aliases are used to create shorter commands that map to longer commands. Aliases enable more efficient workflows by requiring fewer keystrokes to execute a command. To learn more; + + - [Git Alias](https://www.atlassian.com/git/tutorials/git-alias) + + ## Tasks + + - Go through the Git Alias documentation shared here + - Create at least 2 alias for any git commands you feel is too long + - Take a screenshot of the alias you created. hint run `git config --get-regexp alias` + - Take a screenshot of using your alias + - Post these screenshot in the issue created in the prior challenges + + + + + https://github-production-user-asset-6210df.s3.amazonaws.com/19529592/269840111-65c535ce-abcb-4246-8e61-c347127eebef.jpg \ No newline at end of file From 84a00b8aac615a7fc65fe5f19d242adbf26b055e Mon Sep 17 00:00:00 2001 From: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> Date: Sat, 23 Sep 2023 02:15:07 +0000 Subject: [PATCH 35/35] This is the challenge19 Signed-off-by: Sankhadip Das <121531893+sankhadip10@users.noreply.github.com> --- contributors/challenge19/sankha_challenge19.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 contributors/challenge19/sankha_challenge19.md diff --git a/contributors/challenge19/sankha_challenge19.md b/contributors/challenge19/sankha_challenge19.md new file mode 100644 index 000000000..35c62a702 --- /dev/null +++ b/contributors/challenge19/sankha_challenge19.md @@ -0,0 +1,2 @@ +Hi This is Sankhadip +This is a sample file to check the changes that is being made through codebase \ No newline at end of file