Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
b79a878d
Commit
b79a878d
authored
Dec 11, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove a header level in the new 'Automatic CE->EE merge' doc
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
689bc9ea
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
doc/development/automatic_ce_ee_merge.md
doc/development/automatic_ce_ee_merge.md
+1
-1
No files found.
doc/development/automatic_ce_ee_merge.md
View file @
b79a878d
...
@@ -17,7 +17,7 @@ someone who is familiar with the code you touched.
...
@@ -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
[
`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
**
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.
**
EE version of your CE merge request first, if present.
**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment