fix merge conflict

SteveL-MSFT · SteveL-MSFT · commit c678d8e6a921 · 2025-06-05T11:37:44.000-07:00
diff --git a/dsc/src/subcommand.rs b/dsc/src/subcommand.rs
@@ -592,6 +592,10 @@ pub fn resource(subcommand: &ResourceSubCommand, progress_format: ProgressFormat
                 resource_command::get_all(&dsc, resource, output_format.as_ref());
             }
             else {
+                if *output_format == Some(GetOutputFormat::JsonArray) {
+                    error!("{}", t!("subcommand.jsonArrayNotSupported"));
+                    exit(EXIT_INVALID_ARGS);
+                }
                 let parsed_input = get_input(input.as_ref(), path.as_ref(), false);
                 resource_command::get(&dsc, resource, &parsed_input, output_format.as_ref());
             }

Original file line number	Diff line number	Diff line change
`@@ -592,6 +592,10 @@ pub fn resource(subcommand: &ResourceSubCommand, progress_format: ProgressFormat`
`592`	`592`	`resource_command::get_all(&dsc, resource, output_format.as_ref());`
`593`	`593`	`}`
`594`	`594`	`else {`
	`595`	`+ if *output_format == Some(GetOutputFormat::JsonArray) {`
	`596`	`+ error!("{}", t!("subcommand.jsonArrayNotSupported"));`
	`597`	`+ exit(EXIT_INVALID_ARGS);`
	`598`	`+ }`
`595`	`599`	`let parsed_input = get_input(input.as_ref(), path.as_ref(), false);`
`596`	`600`	`resource_command::get(&dsc, resource, &parsed_input, output_format.as_ref());`
`597`	`601`	`}`