Skip to content
This repository was archived by the owner on Aug 30, 2023. It is now read-only.

Commit b8315ec

Browse files
Added my name in challengers list
Signed-off-by: Kishan <kishan.rai99693@gmail.com>
1 parent b90fe0e commit b8315ec

File tree

5 files changed

+41
-0
lines changed

5 files changed

+41
-0
lines changed

Challenges/challenge_1.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ We will start off with an easy task.
55

66
Task:
77
Create a [new issue](https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/new) on this repository with the following details to be added to the content of the issue:
8+
Create a (new issue)[https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/new] on this repository with the following details to be added to the content of the issue:
89

910
```
1011
name: Add your name here

Challenges/challenge_13.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## Welcome to Challenge 13
2+
3+
Welcome to the 13th Challenge
4+
5+
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)
6+
7+
Task:
8+
1. Inside the branch you created in the previous challenge ``your-username-details`` create a new file inside the ``contributors/<YOUR-GITHUB_USERNAME>/`` directory.
9+
2. Use the git stash command to move these changes to the stash area
10+
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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
## Welcome to Challenge 14
2+
3+
Welcome to the 14th Challenge
4+
5+
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.
6+
7+
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.
8+
9+
Task:
10+
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
11+
2. Share appropriate screenshot in the issue created in the first challenge.

Challenges/challenge_15.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
## Welcome to Challenge 15
2+
3+
Welcome to the 15th Challenge
4+
5+
In this 2 part challenge, we will try to emulate and fix merge conflicts via git.
6+
7+
Today is the first part of this challenge:
8+
9+
Task:
10+
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
11+
12+
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.
13+
14+
3. Push your change to reflect in the Pull Request created in previous challenges
15+

challengers-list.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# List of challengers
2+
1. [Mrinal](https://github.com/mrinal1224)
3+
2. [Shivay](https://github.com/shivaylamba)
4+
3. [Kishan](https://github.com/kishanrajput23)

0 commit comments

Comments
 (0)