Contribution-workflow.md

@@ -38,7 +38,8 @@ git checkout mytests
 Don't forget to update your already existing branch with the last version of the master:
 
 ```sh
-git merge master
+git fetch
+git merge origin/master
 ```
 
 Push your branch so it will be accessible for the testsuite.
@@ -76,6 +77,14 @@ and push them:
 git push
 ```
 
+If necessary, update your branch with the master:
+
+```
+git fetch
+git merge origin/master
+git push
+```
+
 Last, run a testsuite on your test branch `mytests` to validate your changes. Once it's done, ask the admin for a [merge](https://gitlab.bsc.es/alya/alya-tests/merge_requests) using the gitlab merge request interface. The admin automatically receives the testsuite emails (if you run it on your machine) so you won't have to justify that it ran with success.
 
 ## Add a new test
@@ -113,8 +122,9 @@ git checkout mytestsuite
 
 Don't forget to update your already existing branch with the last version of the master:
 
-```sh
-git merge master
+```
+git fetch
+git merge origin/master
 ```
 
 Push your branch.
@@ -151,4 +161,12 @@ And push:
 git push
 ```
 
+If necessary, update your branch with the master:
+
+```
+git fetch
+git merge origin/master
+git push
+```
+
 Ask your admin to [merge](https://gitlab.bsc.es/alya/alya-testsuite/merge_requests) your branch.
\ No newline at end of file