diff options
| author | Rene Verschoor <rverschoor@gitlab.com> | 2019-05-27 16:48:00 +0000 |
|---|---|---|
| committer | Rene Verschoor <rverschoor@gitlab.com> | 2019-05-27 16:48:00 +0000 |
| commit | fcdb42b5db9941305184b36ead3ff3374b4b56ad (patch) | |
| tree | 88c3b9463765e9bf78699e1732fdd6359086b1fa /doc/university | |
| parent | 785e55c23ee2480ef90510dcf63b5a7a2c6fe9ce (diff) | |
| download | gitlab-ce-fcdb42b5db9941305184b36ead3ff3374b4b56ad.tar.gz | |
Add MR as common abbreviation for 'Merge Request'glossary-merge-request-mr
Diffstat (limited to 'doc/university')
| -rw-r--r-- | doc/university/glossary/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/university/glossary/README.md b/doc/university/glossary/README.md index 647ad4b2e24..f15b0107de5 100644 --- a/doc/university/glossary/README.md +++ b/doc/university/glossary/README.md @@ -381,7 +381,7 @@ Takes changes from one branch, and [applies them](https://git-scm.com/docs/git-m [Arises](https://about.gitlab.com/2016/09/06/resolving-merge-conflicts-from-the-gitlab-ui/) when a merge can't be performed cleanly between two versions of the same file. -#### Merge Request +#### Merge Request (MR) [Takes changes](../../gitlab-basics/add-merge-request.md) from one branch, and applies them into another branch. |