fixed conflict

Author: JustPies

.gitignore

@@ -26,3 +26,8 @@ Thumbs.db
 *.iws
 *.ipr
 *.ids
+
+######################
+# Custom reference files
+######################
+robbarefoot-content-map.json

.openpublishing.redirection.json

@@ -62794,6 +62794,66 @@
       "source_path": "learn-pr/paths/architect-messaging-serverless/index.yml",
       "redirect_url": "https://learn.microsoft.com/en-us/training/browse/",
       "redirect_document_id": false
-    }                                                                                       
+    },
+    {                                                                                       
+      "source_path": "learn-pr/azure/prepare-your-dev-environment-for-azure-development/index.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/developer/intro/azure-developer-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/prepare-your-dev-environment-for-azure-development/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/developer/intro/azure-developer-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/prepare-your-dev-environment-for-azure-development/2-set-up-dev-environment.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/developer/intro/azure-developer-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/prepare-your-dev-environment-for-azure-development/3-exercise-set-up-dev-environment.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/developer/intro/azure-developer-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/prepare-your-dev-environment-for-azure-development/4-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/developer/intro/azure-developer-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/app-service-scale-up-scale-out/index.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/app-service/manage-scale-up",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/app-service-scale-up-scale-out/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/app-service/manage-scale-up",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/app-service-scale-up-scale-out/2-scale-a-web-app-manually.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/app-service/manage-scale-up",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/app-service-scale-up-scale-out/3-exercise-scale-a-web-app-manually.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/app-service/manage-scale-up",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/app-service-scale-up-scale-out/4-scale-up-a-web-app.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/app-service/manage-scale-up",
+      "redirect_document_id": false
+    }, 
+    {
+      "source_path": "learn-pr/azure/app-service-scale-up-scale-out/5-exercise-scale-up-a-web-app.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/app-service/manage-scale-up",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/app-service-scale-up-scale-out/6-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/app-service/manage-scale-up",
+      "redirect_document_id": false
+    }                                                  
   ]
 }

learn-pr/achievements.yml

@@ -7465,6 +7465,16 @@ achievements:
   title: Automate multi-container Kubernetes deployments with Azure Pipelines
   summary: Deploy multiple containers to an Azure Kubernetes Service cluster with Azure Pipelines.
   iconUrl: /training/achievements/azure-devops/deploy-kubernetes.svg
+- uid: learn.prepare-azure-dev-environment.badge
+  type: badge
+  title: Prepare your development environment for Azure development
+  summary: Set up your local development environment with several popular integrated development environments (IDEs).
+  iconUrl: /training/achievements/prepare-your-dev-environment-for-azure-development.svg
+- uid: learn.azure.app-service-scale-up-scale-out.badge
+  type: badge
+  title: Scale an App Service Web App to Efficiently Meet Demand with App Service Scale Up and Scale Out
+  summary: Respond to periods of increased activity by incrementally increasing the resources available. Then decreasing these resources when activity drops to reduce costs.
+  iconUrl: /training/achievements/app-service-scale-up-scale-out.svg
 - uid: learn.wwl.build-data-analytics-solutions.trophy
   type: trophy
   title: Build data analytics solutions using Azure Synapse serverless SQL pools
@@ -7594,4 +7604,9 @@ achievements:
   type: badge
   title: Architect message brokering and serverless applications in Azure
   summary: Learn how to create reliable messaging for your applications, and how to take advantage of serverless application services in Azure.
-  iconUrl: /training/achievements/architect-messaging-serverless.svg
+  iconUrl: /training/achievements/architect-messaging-serverless.svg
+- uid: learn.wwl.describe-verified-id-concepts.badge
+  type: badge 
+  title: Describe Microsoft Entra Verified ID concepts
+  summary: Learn the core concepts of decentralized identities and Microsoft Entra Verified ID.
+  iconUrl: /training/achievements/generic-badge.svg