Merge branch '23740-create-a-doc-for-the-ce-ee-development-workflow' into 'master'

Start to document how to code for CE with EE in mind Closes #23740 [ci skip] See merge request !7248

Merge branch '23740-create-a-doc-for-the-ce-ee-development-workflow' into 'master'
dc008b01 · Robert Speicher · 96c1cf2f · 3fa5e734 · dc008b01 · dc008b01
Commit dc008b01 authored Nov 17, 2016 by Robert Speicher
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

README.md doc/development/README.md +1 -0

limit_ee_conflicts.md doc/development/limit_ee_conflicts.md +0 -0

No files found.
--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -22,6 +22,7 @@
 ## Process

 - [Generate a changelog entry with `bin/changelog`](changelog.md)
+- [Limit conflicts with EE when developing on CE](limit_ee_conflicts.md)
 - [Code review guidelines](code_review.md) for reviewing code and having code reviewed.
 - [Merge request performance guidelines](merge_request_performance_guidelines.md)
  for ensuring merge requests do not negatively impact GitLab performance

--- a/doc/development/limit_ee_conflicts.md
+++ b/doc/development/limit_ee_conflicts.md