From a8bd3a048f41f835ff9223e4bd4923f6aa33b9fb Mon Sep 17 00:00:00 2001 From: Manas Sahoo Date: Thu, 15 Sep 2022 23:13:00 +0530 Subject: [PATCH 1/2] Challenge 15 Signed-off-by: Manas Sahoo --- challengers-list.md | 1 + 1 file changed, 1 insertion(+) diff --git a/challengers-list.md b/challengers-list.md index 47394f4f2..ffd1cb156 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,3 +1,4 @@ # List of challengers 1. [Mrinal](https://github.com/mrinal1224) 2. [Shivay](https://github.com/shivaylamba) +3. [Manas](https://github.com/manassahoo-dev) From 9fa0c7d1b6000b626212d0a4dda8d10e58862394 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 16 Sep 2022 12:21:01 +0530 Subject: [PATCH 2/2] Challenge 16 Signed-off-by: Manas Sahoo --- Challenges/challenge_16.md | 14 ++++++++++++++ challengers-list.md | 1 + 2 files changed, 15 insertions(+) create mode 100644 Challenges/challenge_16.md 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)