diff --git a/05-team-collaboration/README.md b/05-team-collaboration/README.md index 44423a119d011131487113a1a35b242a0611efba..842ad92a4b2259b11b7c4a9ed8ad9a299ba6f685 100644 --- a/05-team-collaboration/README.md +++ b/05-team-collaboration/README.md @@ -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: + + +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: + + +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: + + + + + diff --git a/05-team-collaboration/media/gitlab-create-mr.png b/05-team-collaboration/media/gitlab-create-mr.png new file mode 100644 index 0000000000000000000000000000000000000000..e1cf6639573c0233470fbcfda701ca07411e8af9 Binary files /dev/null and b/05-team-collaboration/media/gitlab-create-mr.png differ diff --git a/05-team-collaboration/media/gitlab-mr-details.png b/05-team-collaboration/media/gitlab-mr-details.png new file mode 100644 index 0000000000000000000000000000000000000000..f43ef57e464d795c563d8fcf8a71388e75e99590 Binary files /dev/null and b/05-team-collaboration/media/gitlab-mr-details.png differ diff --git a/05-team-collaboration/media/gitlab-review-mr.png b/05-team-collaboration/media/gitlab-review-mr.png new file mode 100644 index 0000000000000000000000000000000000000000..6feda315ddf36c58ed3e63bb0c03c3f5a7566598 Binary files /dev/null and b/05-team-collaboration/media/gitlab-review-mr.png differ