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
Léo-Paul Géneau
gitlab-ce
Commits
2de90dab
Commit
2de90dab
authored
Feb 28, 2017
by
Adam Niedzielski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clarify when to create EE compatibility MR in code review process
parent
cd92c84b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
doc/development/limit_ee_conflicts.md
doc/development/limit_ee_conflicts.md
+6
-0
No files found.
doc/development/limit_ee_conflicts.md
View file @
2de90dab
...
...
@@ -50,6 +50,12 @@ Notes:
asking a GitLab developer to do it once the merge request is merged.
-
If you branch is more than 500 commits behind
`master`
, the job will fail and
you should rebase your branch upon latest
`master`
.
-
Code reviews for merge requests often consist of multiple iterations of
feedback and fixes. There is no need to update your EE MR after each
iteration. Instead, create an EE MR as soon as you see the
`rake ee_compat_check`
job failing and update it after the CE MR is merged.
This helps to identify significant conflicts sooner, but also reduces the
number of times you have to resolve conflicts.
## Possible type of conflicts
...
...
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