diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-16 11:33:42 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-16 11:33:42 +0000 |
| commit | 1a6ceb62836e8bc92b5a6a1775751ffde0d7848f (patch) | |
| tree | f34234f1e220296eed02bdcd4b244fc87aae7cfa | |
| parent | 2cc4cc30b04d229714eb5f08582ce8e341a58338 (diff) | |
| download | gitlab-ce-ee_compat_check-include-git-apply-reject-suggestion.tar.gz | |
Add explanation of when to use reject in ee_compat_check.rbee_compat_check-include-git-apply-reject-suggestion
| -rw-r--r-- | lib/gitlab/ee_compat_check.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb index c2ed267b334..06438d2df41 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -310,6 +310,8 @@ module Gitlab Resolve them, stage the changes and commit them. + If the patch couldn't be applied cleanly, use the following command: + # In the EE repo $ git apply --reject path/to/#{ce_branch}.patch |