diff options
| author | Tom Atkins <tatkins@gitlab.com> | 2019-05-28 20:20:55 +0000 |
|---|---|---|
| committer | Tom Atkins <tatkins@gitlab.com> | 2019-05-28 20:20:55 +0000 |
| commit | 55bc601f88fae4947a27cd61928659e054461762 (patch) | |
| tree | 536e0a20ced04d5808560ca8e24d7d3828351f88 | |
| parent | 8b200634c4909f12cd012c3197c4ffbaf50b99d5 (diff) | |
| parent | fcdb42b5db9941305184b36ead3ff3374b4b56ad (diff) | |
| download | gitlab-ce-55bc601f88fae4947a27cd61928659e054461762.tar.gz | |
Merge branch 'glossary-merge-request-mr' into 'master'
Add MR as common abbreviation for 'Merge Request'
See merge request gitlab-org/gitlab-ce!28793
| -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. |