Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added conflictHandler feature.

  • Loading branch information...
commit 8a0d63f2129ee6422213b9c364152158d33c59f3 1 parent ba66e69
William Collins authored
Showing with 2 additions and 1 deletion.
  1. +2 −1  lib/action_container.js
View
3  lib/action_container.js
@@ -423,13 +423,14 @@ ActionContainer.prototype._checkConflict = function (action) {
// find all options that conflict with this option
action.optionStrings.forEach(function (optionString) {
if (!!optionStringActions[optionString]) {
- conflictOptionals.push([optionString]);
+ conflictOptionals.push(optionString);
}
});
if (conflictOptionals.length > 0) {
if (conflictHandler === 'resolve') {
+ this._removeAction(optionStringActions['--glop']);
return;
}
Please sign in to comment.
Something went wrong with that request. Please try again.