Update how to test a pr (#649)

* Extra note git pull origin pull...

Added a note what to do when you get merge conflicts and to be aware of this.

* docker instructions windows

* Update docs/how-to-test-a-pr.md

1 files changed, 5 insertions, 1 deletions

diff --git a/docs/how-to-test-a-pr.md b/docs/how-to-test-a-pr.md
index c48b49b..c760ec8 100644
--- a/docs/how-to-test-a-pr.md
+++ b/docs/how-to-test-a-pr.md
@@ -69,6 +69,9 @@ The terminal will prompt an editor (usually `nano` or `vim`) that asks to save t
 
 You can read more about the `git` configuration and its default editor [here](http://web.mit.edu/6.005/www/fa14/tutorial/git/config.html).
 
+- Note: Check the message in your console. If it states 'Automatic merge failed; fix conflicts and then commit the result', you should report back to the PR, asking the Developer to please fix the merge conflicts, and remove the 'waiting to be tested' label and attach a 'merge conflict' label.
+
+
 ## Update your local server to apply the changes
 
 Now you simply need to update your local server with the new changes. The procedure is analogue to a normal server update.
@@ -91,7 +94,8 @@ Then start the server just the way you always do.
 
 If you are using the Docker setup, you can simply trigger the recompilation by running:
 
-```./bin/acore-docker-build```
+Linux:  ```./bin/acore-docker-build```  
+Windows: ```./acore.sh docker build``` 
 
 then to launch the server you have to destroy and recreate the containers using `docker-compose down` and `docker-compose up`.