Merge a conflict PR

Ramiro Saenz edited this page Sep 7, 2016 · 1 revision
  1. Go to the PR and click in the "Use the command line" link to display steps.
  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.