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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
9177beea
Commit
9177beea
authored
Nov 23, 2018
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Instruct against squashing in CE to EE MRs
parent
a079bf7f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
doc/development/automatic_ce_ee_merge.md
doc/development/automatic_ce_ee_merge.md
+3
-0
No files found.
doc/development/automatic_ce_ee_merge.md
View file @
9177beea
...
@@ -17,6 +17,9 @@ This merge is done automatically in a
...
@@ -17,6 +17,9 @@ This merge is done automatically in a
1.
If all conflicts are resolved after your resolution is pushed, keep the merge
1.
If all conflicts are resolved after your resolution is pushed, keep the merge
request assigned to you:
**
you are now responsible for the merge request to be
request assigned to you:
**
you are now responsible for the merge request to be
green
**
green
**
1.
If you are the last person to resolve the conflicts, the pipeline is green,
and you have merge rights, merge the MR, but
**do not**
choose to squash.
Otherwise, assign the MR to someone that can merge.
1.
If you need any help, you can ping the current [release managers], or ask in
1.
If you need any help, you can ping the current [release managers], or ask in
the
`#ce-to-ee`
Slack channel
the
`#ce-to-ee`
Slack channel
...
...
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