From 19fb9d05190d9c3d04e804cc2ac299bc771220f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABlG?= Date: Mon, 9 Nov 2015 15:14:24 +0100 Subject: [PATCH] Fixed 'Can only flip STRING and INTEGER values! output.inc:184' --- config_extra.drush.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config_extra.drush.inc b/config_extra.drush.inc index b86c483..cd8d124 100644 --- a/config_extra.drush.inc +++ b/config_extra.drush.inc @@ -282,7 +282,7 @@ function _drush_cme_get_initial_vcs_state(&$merge_info) { } $uncommitted_changes = drush_shell_exec_output(); if (!empty($uncommitted_changes)) { - return drush_set_error('DRUSH_CONFIG_MERGE_UNCOMMITTED_CHANGES', dt("Working set has uncommitted changes; please commit or discard them before merging. `git stash` before `drush config-merge`, and `git stash pop` afterwards can be useful here.\n\n!changes", array('!changes' => $uncommitted_changes))); + return drush_set_error('DRUSH_CONFIG_MERGE_UNCOMMITTED_CHANGES', dt("Working set has uncommitted changes; please commit or discard them before merging. `git stash` before `drush config-merge`, and `git stash pop` afterwards can be useful here.\n\n!changes", array('!changes' => implode('\n', $uncommitted_changes)))); } }