fix merge conflicts

appservice/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@microsoft/vscode-azext-azureappservice",
     "author": "Microsoft Corporation",
-    "version": "3.2.2",
+    "version": "3.3.0",
     "description": "Common tools for developing Azure App Service extensions for VS Code",
     "tags": [
         "azure",
@@ -33,7 +33,7 @@
     "dependencies": {
         "@azure/abort-controller": "^1.0.4",
         "@azure/arm-appinsights": "^5.0.0-beta.4",
-        "@azure/arm-appservice": "^14.0.0",
+        "@azure/arm-appservice": "^15.0.0",
         "@azure/arm-operationalinsights": "^8.0.1",
         "@azure/arm-resourcegraph": "^5.0.0-beta.3",
         "@azure/arm-resources-subscriptions": "^2.0.1",
@@ -42,7 +42,7 @@
         "@azure/storage-blob": "^12.3.0",
         "@microsoft/vscode-azext-azureutils": "^3.0.0",
         "@microsoft/vscode-azext-github": "^1.0.0",
-        "@microsoft/vscode-azext-utils": "^2.2.0",
+        "@microsoft/vscode-azext-utils": "^2.5.0",
         "dayjs": "^1.11.2",
         "fs-extra": "^10.0.0",
         "p-retry": "^3.0.1",
@@ -58,7 +58,7 @@
     "devDependencies": {
         "@azure/core-auth": "^1.4.0",
         "@microsoft/eslint-config-azuretools": "^0.2.1",
-        "@microsoft/vscode-azext-dev": "^2.0.0",
+        "@microsoft/vscode-azext-dev": "^2.0.4",
         "@types/fs-extra": "^9.0.13",
         "@types/mocha": "^9.0.0",
         "@types/node": "^16.0.0",

appservice/src/deploy/waitForDeploymentToComplete.ts

@@ -34,7 +34,8 @@ export async function waitForDeploymentToComplete(context: IActionContext & Part
     const kuduClient = await site.createClient(context);
 
     const { expectedId, token, locationUrl } = options;
-    const pollingInterval = options.pollingInterval ?? 5000;
+    // recommended to poll every second or the deployment id can be recycled before we find it
+    const pollingInterval = options.pollingInterval ?? 1000;
 
     while (!token?.isCancellationRequested) {
         if (locationUrl) {