diff --git a/Challenges/challenge_16.md b/Challenges/challenge_16.md new file mode 100644 index 000000000..6d89c448d --- /dev/null +++ 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: image + +2. Try to resolve this merge conflict using local git + +3. Once resolved, share screenshot on the github issue created in the previous challenges \ No newline at end of file diff --git a/challengers-list.md b/challengers-list.md index ffd1cb156..c6e0734d4 100644 --- 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)