From 4b0d5a201d4d549fde30b97b4d6af98fbb458cb7 Mon Sep 17 00:00:00 2001
From: ramonsalguer <javier.ramon@telefonica.com>
Date: Wed, 20 Mar 2019 20:38:09 +0100
Subject: [PATCH] Git commands added to editor's guide

---
 ...low for documentation production in OSM.md | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/Workflow for documentation production in OSM.md b/Workflow for documentation production in OSM.md
index d756a4c..1d8b981 100644
--- a/Workflow for documentation production in OSM.md	
+++ b/Workflow for documentation production in OSM.md	
@@ -232,19 +232,28 @@ For instance, for a group of committers (Group) called `osm-doc` and a project c
 
 TODO: Include some screenshots
 
-TODO: First online review and, if needs to be rejected, include comments where applicable
+First online review and, if needs to be rejected, include comments where applicable.
 
-If the contribution it is acceptable for a merge, the merge process can be conducted either in the website (particularly if it is a simple review) or in the editor's local repo.
+If the contribution is acceptable for a merge, the merge process can be conducted either in the website (particularly if it is a simple review) or in the editor's local repo. The following steps describe the most generic case of using the local repo.
 
-The following steps describe the case of the local repo.
+First, update your local repository to retrieve the branch(es) with the pending _merge request(s)_:
 
-TODO: Update your local repository to retrieve the branch of the _merge request_
+```bash
+git pull --all
+```
+
+Then, launch the merge operation:
+
+```bash
+git checkout master
+git merge
+```
 
-TODO: Launch a merge
+If completed successfully, mark the merge request as approved in the website (**Project > Merge Requests**) and remove the branch if asked (this will clean up the Git tree in GitLab by removing unnecessary temporary branches).
 
-TODO: Once solved, mark the merge request as approved in the website and remove the branch. If applicable, update the local repository with a `git pull`
+If applicable, update the local repository with a `git pull`
 
-If the merge does not imply conflicts with `master` branch, it will be smoothly solved by Git (as a _fast forward_ or a _recursive_ merge) and properly integrated in `master`.
+If the merge does not imply conflicts with `master` branch, it will be smoothly solved by Git (as a _fast forward_ or as a _recursive_ merge) and properly integrated into `master`.
 
 However, sometimes there might be colliding text lines between `master` and the contribution in the branch. In those cases, Git will request some manual intervention from the editor to proceed to a more careful merge.
 
-- 
GitLab