Created Merge a conflict PR (markdown)

Merge-a-conflict-PR.md

@@ -0,0 +1,7 @@
+1. Go to the PR and click in the "Use the command line" link to display steps.
+![](http://image.prntscr.com/image/bd7a3461aa254575be7c1def6d92cbd4.png)
+2. Do the **Step 1**.
+3. Now you will see in the Git Shell all files with conflicts. Fix them manually.
+4. Add files to stage, by doing `git add .`. Then `git status` to check.
+5. Commit `git commit -m "The message"`.
+6. Follow **Step 2**.