summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-05-16 13:04:52 +0000
committerRémy Coutable <remy@rymai.me>2017-05-16 13:04:52 +0000
commitb3da5e15bd8b7259a6eaef139b63a61bd2e32c39 (patch)
tree9612b6e01bb8da6632227e4c60b4587acaeccd95
parentc6fd3b6a676195e3ed14738df2ad49ab78b12943 (diff)
downloadgitlab-ce-b3da5e15bd8b7259a6eaef139b63a61bd2e32c39.tar.gz
Update ee_compat_check.rb to include `git apply --reject` suggestion
-rw-r--r--lib/gitlab/ee_compat_check.rb11
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb
index 496ee0bdcb0..06438d2df41 100644
--- a/lib/gitlab/ee_compat_check.rb
+++ b/lib/gitlab/ee_compat_check.rb
@@ -309,6 +309,17 @@ module Gitlab
U lib/gitlab/ee_compat_check.rb
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
+
+ This option makes git apply the parts of the patch that are applicable,
+ and leave the rejected hunks in corresponding `.rej` files.
+ You can then resolve the conflicts highlighted in `.rej` by
+ manually applying the correct diff from the `.rej` file to the file with conflicts.
+ When finished, you can delete the `.rej` files and commit your changes.
⚠️ Don't forget to push your branch to gitlab-ee: