diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2017-12-11 13:39:43 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2017-12-11 13:39:43 +0000 |
| commit | 8ff63039f1ee5f6e31a8b910e323977e7de3c634 (patch) | |
| tree | 8df895de5c7213ea60df532b50704f8d674898e5 /doc | |
| parent | 13ac8e5706f76f2e8d92ca85145cae13cf112a07 (diff) | |
| parent | b79a878d110f63e3d7dd4ec01608ecec4a1911b1 (diff) | |
| download | gitlab-ce-8ff63039f1ee5f6e31a8b910e323977e7de3c634.tar.gz | |
Merge branch 'docs/fix-header-level' into 'master'
Remove a header level in the new 'Automatic CE->EE merge' doc
See merge request gitlab-org/gitlab-ce!15843
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/automatic_ce_ee_merge.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/automatic_ce_ee_merge.md b/doc/development/automatic_ce_ee_merge.md index 9e59ddc8cce..4b9791c95bc 100644 --- a/doc/development/automatic_ce_ee_merge.md +++ b/doc/development/automatic_ce_ee_merge.md @@ -17,7 +17,7 @@ someone who is familiar with the code you touched. [`CE Upstream` merge requests]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests?label_name%5B%5D=CE+upstream -### Always merge EE merge requests before their CE counterparts +## Always merge EE merge requests before their CE counterparts **In order to avoid conflicts in the CE->EE merge, you should always merge the EE version of your CE merge request first, if present.** |