Merge branch 'scaleracademy:main' into 4652KishoreKumar-details

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 3 in your forked repository. 
+
+2. Create another commit by making some change in the markdown file (`<YOUR-GITHUB-USERNAME>.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.
+
+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).
+

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.)

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. 

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.

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). 
+