diff options
author | Rémy Coutable <remy@rymai.me> | 2017-12-11 12:30:07 +0100 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-12-11 12:30:07 +0100 |
commit | b79a878d110f63e3d7dd4ec01608ecec4a1911b1 (patch) | |
tree | 3aa6816b7cded8d70994645af87920b69bbcd968 /doc/development | |
parent | 689bc9ea6db102006b548e6176125157955c7f2b (diff) | |
download | gitlab-ce-b79a878d110f63e3d7dd4ec01608ecec4a1911b1.tar.gz |
Remove a header level in the new 'Automatic CE->EE merge' doc
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'doc/development')
-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.** |