Merge branch 'scaleracademy:main' into Kinshuk2003-details

Author: Kinshuk2003

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

Challenges/challenge_12.md

@@ -0,0 +1,14 @@
+## Welcome to Challenge 12
+
+Welcome to the 12th Challenge 
+
+Today's challenge is a re-practice of the 7th Challenge (https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_7.md?plain=1)
+
+So focus for this challenge will be to practice the ``git rebase`` command. We still see a number of Pull requests that have a lot more commits than there should be, therefore we give you a chance to correct it again. 
+
+Ensure to practice the ``git rebase`` command by creating your own local git repository. You can checkout this guide: https://www.freecodecamp.org/news/git-squash-explained/
+
+Task: 
+1. Practice git rebase, and how to squash commit using git rebase in your local projects 
+2. Once done, try to squash the commits in your pull request in the Challenge repository
+3. We also see a lot of challengers are not signing their commits. Refer to Challenge 10: https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_10.md and ensure to sign your commits. 

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/<YOUR-GITHUB_USERNAME>/`` 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

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. 

Challenges/challenge_15.md

@@ -0,0 +1,15 @@
+## Welcome to Challenge 15
+
+Welcome to the 15th Challenge 
+
+In this 2 part challenge, we will try to emulate and fix merge conflicts via git. 
+
+Today is the first part of this challenge: 
+
+Task: 
+1. Update your Forked Repo From the Original Repo. Also ensure that your branch ``your-user-name-details`` is also synced with the latest changes from the original repository
+
+2. In your branch ``your-user-name-details`` open the add your name to the list of challengers inside the ``challengers-list.md`` file by following the format in the file. 
+
+3. Push your change to reflect in the Pull Request created in previous challenges
+

challengers-list.md

@@ -0,0 +1,3 @@
+# List of challengers
+1. [Mrinal](https://github.com/mrinal1224)
+2. [Shivay](https://github.com/shivaylamba)