diff --git a/Workflow for documentation production in OSM.md b/Workflow for documentation production in OSM.md index d756a4cb840d4ffc1dc373bb8906e70550e49247..1d8b981e1a33a09a0a34e80f83b4f99bdb8405b2 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.