From 1a6ceb62836e8bc92b5a6a1775751ffde0d7848f Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Tue, 16 May 2017 11:33:42 +0000 Subject: Add explanation of when to use reject in ee_compat_check.rb --- lib/gitlab/ee_compat_check.rb | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit v1.2.1