diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-03 10:48:04 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-03 10:48:04 +0000 |
| commit | a9a581567c6d56186feade11ad867a66ab872ca6 (patch) | |
| tree | aaf027f093b9fe601ff827cbe2754008cd60925d | |
| parent | 4f44717d386582622504669097f536ab0e8936e5 (diff) | |
| parent | b566336ba6525bb2472b6ebce6f4dc3b95835179 (diff) | |
| download | gitlab-ce-a9a581567c6d56186feade11ad867a66ab872ca6.tar.gz | |
Merge branch 'ee-comp-mr-2' into 'master'
Improve EE compatibility MR docs [ci skip]
See merge request !9681
| -rw-r--r-- | doc/development/limit_ee_conflicts.md | 5 |
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 |