summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2017-03-03 10:15:08 +0000
committerAdam Niedzielski <adamsunday@gmail.com>2017-03-03 10:15:08 +0000
commitb566336ba6525bb2472b6ebce6f4dc3b95835179 (patch)
tree29b14267bf43f7545f66dde487d851c60c01c21b
parentb18646040c9b17c69ac66fb687b02450e161808c (diff)
downloadgitlab-ce-b566336ba6525bb2472b6ebce6f4dc3b95835179.tar.gz
Improve EE compatibility MR docs [ci skip] ee-comp-mr-2
EE MR should be updated before CE MR is merged. Suggest using "git rerere".
-rw-r--r--doc/development/limit_ee_conflicts.md5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/development/limit_ee_conflicts.md b/doc/development/limit_ee_conflicts.md
index e3568b65b18..51b4b398f2c 100644
--- a/doc/development/limit_ee_conflicts.md
+++ b/doc/development/limit_ee_conflicts.md
@@ -53,9 +53,12 @@ Notes:
- 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.
+ `rake ee_compat_check` job failing. After you receive the final acceptance
+ from a Maintainer (but before the CE MR is merged) update the EE MR.
This helps to identify significant conflicts sooner, but also reduces the
number of times you have to resolve conflicts.
+- You can use [`git rerere`](https://git-scm.com/blog/2010/03/08/rerere.html)
+ to avoid resolving the same conflicts multiple times.
## Possible type of conflicts