From 6e7edd80288caf6d8b2045232762e91a5d051185 Mon Sep 17 00:00:00 2001 From: Beth Skurrie Date: Wed, 4 Aug 2021 13:24:35 +1000 Subject: [PATCH] feat(can-i-deploy): remove feature toggle for --ignore option --- lib/pact_broker/client/cli/broker.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/pact_broker/client/cli/broker.rb b/lib/pact_broker/client/cli/broker.rb index 423f4c85..af0c29c5 100644 --- a/lib/pact_broker/client/cli/broker.rb +++ b/lib/pact_broker/client/cli/broker.rb @@ -31,7 +31,9 @@ class Broker < CustomThor method_option :tag, aliases: "-t", type: :array, banner: "TAG", desc: "Tag name for consumer version. Can be specified multiple times." method_option :tag_with_git_branch, aliases: "-g", type: :boolean, default: false, required: false, desc: "Tag consumer version with the name of the current git branch. Default: false" method_option :build_url, desc: "The build URL that created the pact" + method_option :on_conflict, desc: "If a pact already exists for this consumer version and provider with different content, specify what action should be taken. Options are " method_option :merge, type: :boolean, default: false, require: false, desc: "If a pact already exists for this consumer version and provider, merge the contents. Useful when running Pact tests concurrently on different build nodes." + output_option_json_or_text shared_authentication_options