From 2000d80ab248f9bf82f2b20ff3d190b1c61b4787 Mon Sep 17 00:00:00 2001 From: Ramiro Saenz Date: Wed, 7 Sep 2016 13:36:46 -0300 Subject: [PATCH] Created Merge a conflict PR (markdown) --- Merge-a-conflict-PR.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Merge-a-conflict-PR.md diff --git a/Merge-a-conflict-PR.md b/Merge-a-conflict-PR.md new file mode 100644 index 0000000..3425849 --- /dev/null +++ b/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**. \ No newline at end of file