chore(release): 3.22.34-dev.1 [skip ci]

Author: svc-cli-bot

README.md

@@ -141,14 +141,7 @@ FLAG DESCRIPTIONS
     If you specify this flag, don’t specify --metadata or --source-dir.
 ```
 
-<<<<<<< HEAD
-_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/convert/mdapi.ts)_
-||||||| 2eb4732
-_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/convert/mdapi.ts)_
-=======
-_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/convert/mdapi.ts)_
-
-> > > > > > > origin/main
+_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/convert/mdapi.ts)_
 
 ## `sf project convert source`
 
@@ -221,14 +214,7 @@ FLAG DESCRIPTIONS
     Override the api version used for api requests made by this command
 ```
 
-<<<<<<< HEAD
-_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/convert/source.ts)_
-||||||| 2eb4732
-_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/convert/source.ts)_
-=======
-_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/convert/source.ts)_
-
-> > > > > > > origin/main
+_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/convert/source.ts)_
 
 ## `sf project convert source-behavior`
 
@@ -287,14 +273,7 @@ EXAMPLES
     $ sf project convert source-behavior --behavior decomposePermissionSetBeta --dry-run --preserve-temp-dir
 ```
 
-<<<<<<< HEAD
-_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/convert/source-behavior.ts)_
-||||||| 2eb4732
-_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/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.22.35/src/commands/project/convert/source-behavior.ts)_
-
-> > > > > > > origin/main
+_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/convert/source-behavior.ts)_
 
 ## `sf project delete source`
 
@@ -434,14 +413,7 @@ FLAG DESCRIPTIONS
     - Separate the test names with spaces: --tests Test1 Test2 "Test With Space"
 ```
 
-<<<<<<< HEAD
-_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/delete/source.ts)_
-||||||| 2eb4732
-_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/delete/source.ts)_
-=======
-_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/delete/source.ts)_
-
-> > > > > > > origin/main
+_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/delete/source.ts)_
 
 ## `sf project delete tracking`
 
@@ -478,14 +450,7 @@ EXAMPLES
     $ sf project delete tracking --target-org my-scratch
 ```
 
-<<<<<<< HEAD
-_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/delete/tracking.ts)_
-||||||| 2eb4732
-_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/delete/tracking.ts)_
-=======
-_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/delete/tracking.ts)_
-
-> > > > > > > origin/main
+_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/delete/tracking.ts)_
 
 ## `sf project deploy cancel`
 
@@ -557,14 +522,7 @@ FLAG DESCRIPTIONS
     project deploy report".
 ```
 
-<<<<<<< HEAD
-_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/cancel.ts)_
-||||||| 2eb4732
-_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/cancel.ts)_
-=======
-_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/cancel.ts)_
-
-> > > > > > > origin/main
+_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/deploy/cancel.ts)_
 
 ## `sf project deploy preview`
 
@@ -647,14 +605,7 @@ FLAG DESCRIPTIONS
     All child components are included. If you specify this flag, don’t specify --metadata or --source-dir.
 ```
 
-<<<<<<< HEAD
-_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/preview.ts)_
-||||||| 2eb4732
-_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/preview.ts)_
-=======
-_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/preview.ts)_
-
-> > > > > > > origin/main
+_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/deploy/preview.ts)_
 
 ## `sf project deploy quick`
 
@@ -738,14 +689,7 @@ FLAG DESCRIPTIONS
     deploy report".
 ```
 
-<<<<<<< HEAD
-_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/quick.ts)_
-||||||| 2eb4732
-_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/quick.ts)_
-=======
-_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/quick.ts)_
-
-> > > > > > > origin/main
+_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/deploy/quick.ts)_
 
 ## `sf project deploy report`
 
@@ -837,14 +781,7 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
-<<<<<<< HEAD
-_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/report.ts)_
-||||||| 2eb4732
-_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/report.ts)_
-=======
-_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/report.ts)_
-
-> > > > > > > origin/main
+_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/deploy/report.ts)_
 
 ## `sf project deploy resume`
 
@@ -929,14 +866,7 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
-<<<<<<< HEAD
-_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/resume.ts)_
-||||||| 2eb4732
-_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/resume.ts)_
-=======
-_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/resume.ts)_
-
-> > > > > > > origin/main
+_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/deploy/resume.ts)_
 
 ## `sf project deploy start`
 
@@ -1172,14 +1102,7 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
-<<<<<<< HEAD
-_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/start.ts)_
-||||||| 2eb4732
-_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/start.ts)_
-=======
-_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/start.ts)_
-
-> > > > > > > origin/main
+_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/deploy/start.ts)_
 
 ## `sf project deploy validate`
 
@@ -1352,14 +1275,7 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
-<<<<<<< HEAD
-_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/validate.ts)_
-||||||| 2eb4732
-_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/validate.ts)_
-=======
-_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/validate.ts)_
-
-> > > > > > > origin/main
+_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/deploy/validate.ts)_
 
 ## `sf project generate manifest`
 
@@ -1455,14 +1371,7 @@ EXAMPLES
     $ sf project generate manifest --from-org [email protected] --excluded-metadata StandardValueSet
 ```
 
-<<<<<<< HEAD
-_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/generate/manifest.ts)_
-||||||| 2eb4732
-_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/generate/manifest.ts)_
-=======
-_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/generate/manifest.ts)_
-
-> > > > > > > origin/main
+_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/generate/manifest.ts)_
 
 ## `sf project list ignored`
 
@@ -1504,14 +1413,7 @@ EXAMPLES
     $ sf project list ignored --source-dir package.xml
 ```
 
-<<<<<<< HEAD
-_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/list/ignored.ts)_
-||||||| 2eb4732
-_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/list/ignored.ts)_
-=======
-_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/list/ignored.ts)_
-
-> > > > > > > origin/main
+_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/list/ignored.ts)_
 
 ## `sf project reset tracking`
 
@@ -1560,14 +1462,7 @@ EXAMPLES
     $ sf project reset tracking --revision 30
 ```
 
-<<<<<<< HEAD
-_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/reset/tracking.ts)_
-||||||| 2eb4732
-_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/reset/tracking.ts)_
-=======
-_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/reset/tracking.ts)_
-
-> > > > > > > origin/main
+_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/reset/tracking.ts)_
 
 ## `sf project retrieve preview`
 
@@ -1621,14 +1516,7 @@ FLAG DESCRIPTIONS
     production orgs.
 ```
 
-<<<<<<< HEAD
-_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/retrieve/preview.ts)_
-||||||| 2eb4732
-_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/retrieve/preview.ts)_
-=======
-_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/retrieve/preview.ts)_
-
-> > > > > > > origin/main
+_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/retrieve/preview.ts)_
 
 ## `sf project retrieve start`
 
@@ -1638,7 +1526,7 @@ Retrieve metadata from an org to your local project.
 USAGE
   $ sf project retrieve start -o <value> [--json] [--flags-dir <value>] [-a <value>] [-c] [-x <value> | -m <value>... | -d
     <value>...] [-r <value> | -n <value>... | ] [--single-package -t <value>] [-w <value>] [-z ] [--zip-file-name
-    <value> ]
+    <value> ] [--poll-interval <seconds>]
 
 FLAGS
   -a, --api-version=<value>      Target API version for the retrieve.
@@ -1655,6 +1543,7 @@ FLAGS
   -w, --wait=<value>             [default: 33 minutes] Number of minutes to wait for the command to complete and display
                                  results to the terminal window.
   -x, --manifest=<value>         File path for the manifest (package.xml) that specifies the components to retrieve.
+      --poll-interval=<seconds>  Number of seconds to wait between status checks.
 
 METADATA API FORMAT FLAGS
   -t, --target-metadata-dir=<value>  Directory that will contain the retrieved metadata format files or ZIP.
@@ -1801,13 +1690,6 @@ FLAG DESCRIPTIONS
     If you specify this flag, don’t specify --metadata or --source-dir.
 ```
 
-<<<<<<< HEAD
-_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/retrieve/start.ts)_
-||||||| 2eb4732
-_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/retrieve/start.ts)_
-=======
-_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/retrieve/start.ts)_
-
-> > > > > > > origin/main
+_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/retrieve/start.ts)_
 
 <!-- commandsstop -->

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/plugin-deploy-retrieve",
   "description": "deploy and retrieve commands for sf",
-  "version": "3.22.34-dev.0",
+  "version": "3.22.34-dev.1",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "resolutions": {