fix(picklist): fix incorrect conflict resolution

dxatscale · Nov 24, 2023 · e596a54 · e596a54
1 parent 2ddda44
commit e596a54
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/packages/core/src/package/deploymentCustomizers/PicklistEnabler.ts b/packages/core/src/package/deploymentCustomizers/PicklistEnabler.ts
@@ -74,13 +74,14 @@ export default class PicklistEnabler implements DeploymentCustomizer {
 
                     let picklistInOrg = await this.getPicklistInOrg(urlId, sfpOrg.getConnection());
 
-                    if (!picklistInOrg?.Metadata?.valueSet?.valueSetDefinition)
-                        SFPLogger.log(
+                    //check for empty picklists on org and fix first deployment issue
+                    if (!picklistInOrg?.Metadata?.valueSet?.valueSetDefinition) {
+                    SFPLogger.log(
                             `Picklist field ${objName}.${picklistName} not in target Org. Skipping`,
                             LoggerLevel.TRACE,
                             logger
                         );
-                        continue;
+                    continue;
                     }