lib/octopolo/scripts/accept_pull.rb in octopolo-1.5.1 vs lib/octopolo/scripts/accept_pull.rb in octopolo-1.5.2

@@ -38,11 +38,11 @@
         Git.fetch
         if pull_request.mergeable?
           if pull_request.status_checks_passed? || @force
             cli.perform "git merge --no-ff origin/#{pull_request.branch} -m \"Merge pull request ##{pull_request_id} from origin/#{pull_request.branch}\""
           else
-            cli.say 'Status checks have not passed on this pull request.'
+            cli.say 'Previous action not completed. Status checks have not passed on this pull request.'
             exit!
           end
         else
           cli.say "There is a merge conflict with this branch and #{config.deploy_branch}."
           cli.say "Please update this branch with #{config.deploy_branch} or perform the merge manually and fix any conflicts"
@@ -69,6 +69,5 @@
       end
 
     end
   end
 end
-