chore: merge conflicts

Author: iowillhoit

CHANGELOG.md

@@ -1,3 +1,57 @@
+## [3.24.32](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.24.31...3.24.32) (2026-04-18)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/plugin-info from 3.4.114 to 3.4.122 ([8788729](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/8788729fdb603166e349b2caeb4b4dd9fd64a028))
+
+## [3.24.31](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.24.30...3.24.31) (2026-04-18)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/core from 8.28.1 to 8.28.3 ([4320363](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/4320363eb615fe61c48036deda7475afdcd9b7e9))
+
+## [3.24.30](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.24.29...3.24.30) (2026-04-17)
+
+### Bug Fixes
+
+- **deps:** bump basic-ftp from 5.2.1 to 5.3.0 ([57f8a19](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/57f8a19e7edb22f68984ca6bc5bcc2d1bb8e04d5))
+
+## [3.24.29](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.24.28...3.24.29) (2026-04-11)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/source-deploy-retrieve ([a29d638](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/a29d6383e4054b2da29b787e33a4b003197f13ab))
+
+## [3.24.28](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.24.27...3.24.28) (2026-04-09)
+
+### Bug Fixes
+
+- **deps:** bump basic-ftp from 5.2.0 to 5.2.1 ([16d60ff](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/16d60ff8c25841eb60d18fd69d2e7aae43ee36a5))
+
+## [3.24.27](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.24.26...3.24.27) (2026-04-05)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/source-tracking from 7.8.8 to 7.8.9 ([38752da](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/38752daaf88c58cfe4ed0d7c931efb0125dd7e66))
+
+## [3.24.26](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.24.25...3.24.26) (2026-04-04)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/core from 8.27.1 to 8.28.1 ([4b9363e](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/4b9363e3d20f2d44f3cd7d440879071417a1707c))
+
+## [3.24.25](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.24.24...3.24.25) (2026-04-04)
+
+### Bug Fixes
+
+- **deps:** bump @oclif/multi-stage-output from 0.8.33 to 0.8.34 ([81fbcec](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/81fbcecd92eb4b88d311b0a14fd38d949ca4984b))
+
+## [3.24.24](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.24.23...3.24.24) (2026-04-04)
+
+### Bug Fixes
+
+- **deps:** bump lodash from 4.17.23 to 4.18.1 ([e7cfada](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/e7cfada3b76b66c1e7fcb6991b48f156286db33d))
+
 ## [3.24.23](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.24.22...3.24.23) (2026-03-30)
 
 ### Bug Fixes

README.md

@@ -141,7 +141,7 @@ FLAG DESCRIPTIONS
     If you specify this flag, don’t specify --metadata or --source-dir.
 ```
 
-_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.23/src/commands/project/convert/mdapi.ts)_
+_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.32/src/commands/project/convert/mdapi.ts)_
 
 ## `sf project convert source`
 
@@ -214,7 +214,7 @@ FLAG DESCRIPTIONS
     Override the api version used for api requests made by this command
 ```
 
-_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.23/src/commands/project/convert/source.ts)_
+_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.32/src/commands/project/convert/source.ts)_
 
 ## `sf project convert source-behavior`
 
@@ -273,7 +273,7 @@ EXAMPLES
     $ sf project convert source-behavior --behavior decomposePermissionSetBeta --dry-run --preserve-temp-dir
 ```
 
-_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.23/src/commands/project/convert/source-behavior.ts)_
+_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.32/src/commands/project/convert/source-behavior.ts)_
 
 ## `sf project delete source`
 
@@ -426,7 +426,7 @@ FLAG DESCRIPTIONS
     - Separate the test names with spaces: --tests Test1 Test2 "Test With Space"
 ```
 
-_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.23/src/commands/project/delete/source.ts)_
+_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.32/src/commands/project/delete/source.ts)_
 
 ## `sf project delete tracking`
 
@@ -463,7 +463,7 @@ EXAMPLES
     $ sf project delete tracking --target-org my-scratch
 ```
 
-_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.23/src/commands/project/delete/tracking.ts)_
+_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.32/src/commands/project/delete/tracking.ts)_
 
 ## `sf project deploy cancel`
 
@@ -535,7 +535,7 @@ FLAG DESCRIPTIONS
     project deploy report".
 ```
 
-_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.23/src/commands/project/deploy/cancel.ts)_
+_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.32/src/commands/project/deploy/cancel.ts)_
 
 ## `sf project deploy preview`
 
@@ -618,7 +618,7 @@ FLAG DESCRIPTIONS
     All child components are included. If you specify this flag, don’t specify --metadata or --source-dir.
 ```
 
-_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.23/src/commands/project/deploy/preview.ts)_
+_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.32/src/commands/project/deploy/preview.ts)_
 
 ## `sf project deploy quick`
 
@@ -702,7 +702,7 @@ FLAG DESCRIPTIONS
     deploy report".
 ```
 
-_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.23/src/commands/project/deploy/quick.ts)_
+_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.32/src/commands/project/deploy/quick.ts)_
 
 ## `sf project deploy report`
 
@@ -794,7 +794,7 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
-_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.23/src/commands/project/deploy/report.ts)_
+_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.32/src/commands/project/deploy/report.ts)_
 
 ## `sf project deploy resume`
 
@@ -879,7 +879,7 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
-_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.23/src/commands/project/deploy/resume.ts)_
+_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.32/src/commands/project/deploy/resume.ts)_
 
 ## `sf project deploy start`
 
@@ -1128,7 +1128,7 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
-_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.23/src/commands/project/deploy/start.ts)_
+_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.32/src/commands/project/deploy/start.ts)_
 
 ## `sf project deploy validate`
 
@@ -1315,7 +1315,7 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
-_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.23/src/commands/project/deploy/validate.ts)_
+_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.32/src/commands/project/deploy/validate.ts)_
 
 ## `sf project generate manifest`
 
@@ -1411,7 +1411,7 @@ EXAMPLES
     $ sf project generate manifest --from-org test@myorg.com --excluded-metadata StandardValueSet
 ```
 
-_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.23/src/commands/project/generate/manifest.ts)_
+_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.32/src/commands/project/generate/manifest.ts)_
 
 ## `sf project list ignored`
 
@@ -1453,7 +1453,7 @@ EXAMPLES
     $ sf project list ignored --source-dir package.xml
 ```
 
-_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.23/src/commands/project/list/ignored.ts)_
+_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.32/src/commands/project/list/ignored.ts)_
 
 ## `sf project reset tracking`
 
@@ -1502,7 +1502,7 @@ EXAMPLES
     $ sf project reset tracking --revision 30
 ```
 
-_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.23/src/commands/project/reset/tracking.ts)_
+_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.32/src/commands/project/reset/tracking.ts)_
 
 ## `sf project retrieve preview`
 
@@ -1556,7 +1556,7 @@ FLAG DESCRIPTIONS
     production orgs.
 ```
 
-_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.23/src/commands/project/retrieve/preview.ts)_
+_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.32/src/commands/project/retrieve/preview.ts)_
 
 ## `sf project retrieve start`
 
@@ -1729,6 +1729,6 @@ FLAG DESCRIPTIONS
     If you specify this flag, don’t specify --metadata or --source-dir.
 ```
 
-_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.23/src/commands/project/retrieve/start.ts)_
+_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.24.32/src/commands/project/retrieve/start.ts)_
 
 <!-- commandsstop -->

package.json

@@ -1,19 +1,19 @@
 {
   "name": "@salesforce/plugin-deploy-retrieve",
   "description": "deploy and retrieve commands for sf",
-  "version": "3.24.23",
+  "version": "3.24.32",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "enableO11y": true,
   "o11yUploadEndpoint": "https://794testsite.my.site.com/byolwr/webruntime/log/metrics",
   "dependencies": {
     "@inquirer/prompts": "^7.8.3",
     "@oclif/core": "^4.10.3",
-    "@oclif/multi-stage-output": "^0.8.28",
+    "@oclif/multi-stage-output": "^0.8.34",
     "@salesforce/apex-node": "^8.4.16",
     "@salesforce/core": "^8.28.3",
     "@salesforce/kit": "^3.2.4",
-    "@salesforce/plugin-info": "^3.4.93",
+    "@salesforce/plugin-info": "^3.4.122",
     "@salesforce/sf-plugins-core": "^12.2.6",
     "@salesforce/source-deploy-retrieve": "^12.32.9",
     "@salesforce/source-tracking": "^7.8.14",
@@ -22,13 +22,13 @@
     "terminal-link": "^3.0.0"
   },
   "devDependencies": {
-    "@oclif/plugin-command-snapshot": "^5.3.8",
-    "@salesforce/cli-plugins-testkit": "^5.3.41",
+    "@oclif/plugin-command-snapshot": "^5.3.15",
+    "@salesforce/cli-plugins-testkit": "^5.3.50",
     "@salesforce/dev-scripts": "^11.0.4",
     "@salesforce/plugin-command-reference": "^3.1.78",
     "@salesforce/schemas": "^1.9.0",
-    "@salesforce/source-testkit": "^2.2.179",
-    "@salesforce/ts-sinon": "^1.4.33",
+    "@salesforce/source-testkit": "^2.2.187",
+    "@salesforce/ts-sinon": "^1.4.34",
     "cross-env": "^7.0.3",
     "eslint-plugin-sf-plugin": "^1.20.32",
     "oclif": "^4.22.32",

test/nuts/specialTypes/nestedLWCProject/yarn.lock

@@ -2563,9 +2563,9 @@ flatted@^3.1.0:
   integrity sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==
 
 follow-redirects@^1.14.0:
-  version "1.15.4"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
-  integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.16.0.tgz#28474a159d3b9d11ef62050a14ed60e4df6d61bc"
+  integrity sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -3896,9 +3896,9 @@ lodash.truncate@^4.4.2:
   integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
 
 lodash@^4.17.21, lodash@^4.7.0:
-  version "4.17.23"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
-  integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
+  version "4.18.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"
+  integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==
 
 log-update@^4.0.0:
   version "4.0.0"