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

Commit c94903f

Browse files
shivaylambaRishav986
authored andcommitted
Create challenge_14.md
Signed-off-by: Rishav986 <[email protected]>
1 parent b7305bb commit c94903f

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

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.

0 commit comments

Comments
 (0)