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

Commit d35dd85

Browse files
committed
Challenge 15
Signed-off-by: ShardulDS <ssajnekar@gmail.com>
1 parent 997d29b commit d35dd85

File tree

3 files changed

+19
-0
lines changed

3 files changed

+19
-0
lines changed

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. [Shardul](https://github.com/ShardulDS)
File renamed without changes.

0 commit comments

Comments
 (0)