summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2018-02-26 14:06:11 -0300
committerMarcia Ramos <virtua.creative@gmail.com>2018-02-26 14:06:11 -0300
commit82e49e67fc50bfc0881a8ec611a96ab9e2b04514 (patch)
tree92e74efb5182b17ca699b57fd3b61325660ca7be
parent52cfc83695d4ec7456268ddc4b4ac18151b105f7 (diff)
downloadgitlab-ce-82e49e67fc50bfc0881a8ec611a96ab9e2b04514.tar.gz
copyedit
-rw-r--r--doc/development/writing_documentation.md11
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/development/writing_documentation.md b/doc/development/writing_documentation.md
index c7827679745..8cbd6ebe370 100644
--- a/doc/development/writing_documentation.md
+++ b/doc/development/writing_documentation.md
@@ -208,14 +208,19 @@ merge commit SHA is `138f5e2f20289bb376caffa0303adb0cac859ce1`:
git cherry-pick -m 1 138f5e2f20289bb376caffa0303adb0cac859ce1
```
-- Note that the review will occur only in the CE MR, as we expect that the EE MR
+- Note that the review will occur only in the CE MR, as the EE MR
contains the same commits as the CE MR.
- If you push more commits to the CE branch, you can safely repeat the procedure
-to cherry-pick them to EE.
+to cherry-pick them to the EE-equivalent branch. You can do that as many times as
+necessary, using the same CE and EE branches.
- If you have a few more changes that apply to the EE-version only, you can submit
a couple more commits to the EE branch, but ask the reviewer to review the EE merge request
-additionally to the CE MR. If there are many EE-only changes, please start a new MR
+additionally to the CE MR. If there are many EE-only changes though, please start a new MR
to EE only.
+- If you submitted the merge request to the CE repo and the `ee-compat-check` job passed,
+you are not required to submit the EE-equivalent MR, but it's still recommended. If the
+job failed, you are required to submit the EE MR so that you can fix the conflicts in EE
+before merging your changes into CE.
### Previewing the changes live