From e596a54903750d0a6debd70c3550072dcd3086ae Mon Sep 17 00:00:00 2001
From: "azlam.abdulsalam" <azlam@adiza.dev>
Date: Sat, 25 Nov 2023 07:39:41 +1100
Subject: [PATCH] fix(picklist): fix incorrect conflict resolution

---
 .../src/package/deploymentCustomizers/PicklistEnabler.ts   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/package/deploymentCustomizers/PicklistEnabler.ts b/packages/core/src/package/deploymentCustomizers/PicklistEnabler.ts
index dc22dd4c9..e2aebca93 100644
--- 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;
                     }