Skip to content
This repository was archived by the owner on Apr 8, 2020. It is now read-only.

Commit 19fb9d0

Browse files
committed
Fixed 'Can only flip STRING and INTEGER values! output.inc:184'
1 parent a6942ba commit 19fb9d0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

config_extra.drush.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ function _drush_cme_get_initial_vcs_state(&$merge_info) {
282282
}
283283
$uncommitted_changes = drush_shell_exec_output();
284284
if (!empty($uncommitted_changes)) {
285-
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)));
285+
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))));
286286
}
287287
}
288288

0 commit comments

Comments
 (0)