Challenge 16

scaleracademy · Sep 16, 2022 · d249036 · d249036
1 parent e026626
commit d249036
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/Challenges/challenge_16.md b/Challenges/challenge_16.md
@@ -0,0 +1,14 @@
+## Welcome to Challenge 16
+
+Welcome to the 16th Challenge 
+
+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. You will notice that your pull request will have a conflict: <img width="636" alt="image" src="https://user-images.githubusercontent.com/19529592/190574995-0cc506a8-a2fe-4aa4-98bd-4658e8aa2fc1.png">
+
+2. Try to resolve this merge conflict using local git 
+
+3. Once resolved, share screenshot on the github issue created in the previous challenges
diff --git a/challengers-list.md b/challengers-list.md
@@ -2,3 +2,4 @@
 1. [Mrinal](https://github.com/mrinal1224)
 2. [Shivay](https://github.com/shivaylamba)
 3. [Manas](https://github.com/manassahoo-dev)
+4. [Raghav](https://github.com/raghavdhingra)