Skip to content
Snippets Groups Projects
Commit fb5e413d authored by Mark HOEBEKE's avatar Mark HOEBEKE
Browse files

Updated contents of collaboration section.

parent ec676d36
No related branches found
No related tags found
1 merge request!10Include collaboration section into main branch.
......@@ -29,6 +29,25 @@ Branch protection settings can be accesed from the left panel, using the *Settin
When working collaboratively on a project, it is recommended not to merge or push to branches on which other people are susceptible to work as well. Instead, when a set of commits has been tested, it is recommended to create a *Merge Request* (or MR). An MR leaves an explicit track in GitLab of a set of modifications, whereas simple commit/push/merge operations quickly become invisible in the project's history. Moreover, an MR can be assigned to another project member, giving him or her the opportunity to review your modifications. If needed, the reviewer can require additionnal comments or even suggest fixes or enhancements. This reviewing process adds a lot of value to the project's code or document base.
An MR follows the same principle as an ordinary merge, and is defined by a source and a target branch. Managing MRs in GitLab is done with the *Merge Requests* entry of the left panel.
#### Note
It makes sense to assign an MR to oneself, at least to keep track of "batches" of content that have been modified together. It also gives an opportunity to add more comments.
An MR follows the same principle as an ordinary merge, and is defined by a source and a target branch. Managing MRs in GitLab is done with the *Merge Requests* entry of the left panel. Also, when committing changes using the GitLab IDE, the default settings is to create a new MR. So this is another way to create a new MR.
The following screenshot show the MR creating interface:
![gitlab-create-mr](./media/gitlab-create-mr.png)
The assignee of an MR automatically receives an email notification when it is created with a direct link to a page allowing him or her to review the MR.
The following screenshot shows an example of MR review page:
![gitlab-review-mr.png](./media/gitlab-review-mr.png)
Note the `Changes` link rightmost on the line starting with `Overview`. This link allows the reviewer to inspect every detail of the changes included in the MR.
The following screenshot shows an example of such a detailed changed page:
![gitlab-mr-details.png](./media/gitlab-mr-details.png)
05-team-collaboration/media/gitlab-create-mr.png

107 KiB

05-team-collaboration/media/gitlab-mr-details.png

150 KiB

05-team-collaboration/media/gitlab-review-mr.png

157 KiB

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment