fixed conflicts

Author: JustPies

.gitignore

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

.openpublishing.redirection.json

@@ -62879,6 +62879,141 @@
       "source_path": "learn-pr/paths/build-applications-with-azure-devops/index.yml",
       "redirect_url": "https://learn.microsoft.com/en-us/training/browse/",
       "redirect_document_id": false
-    }                                                                                                              
+    },
+    {                                                                                                              
+      "source_path": "learn-pr/paths/create-serverless-applications/index.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/create-serverless-logic-with-azure-functions/index.yml",
+      "redirect_url": "https://learn.microsoft.com/azure/azure-functions/functions-create-function-app-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/create-serverless-logic-with-azure-functions/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/azure/azure-functions/functions-create-function-app-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/create-serverless-logic-with-azure-functions/2-decide-if-serverless-computing-is-right-for-your-business-need.yml",
+      "redirect_url": "https://learn.microsoft.com/azure/azure-functions/functions-create-function-app-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/create-serverless-logic-with-azure-functions/3-create-an-azure-functions-app-in-the-azure-portal.yml",
+      "redirect_url": "https://learn.microsoft.com/azure/azure-functions/functions-create-function-app-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/create-serverless-logic-with-azure-functions/4-creating-and-executing-an-azure-function.yml",
+      "redirect_url": "https://learn.microsoft.com/azure/azure-functions/functions-create-function-app-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/create-serverless-logic-with-azure-functions/5-add-logic-to-the-function-app.yml",
+      "redirect_url": "https://learn.microsoft.com/azure/azure-functions/functions-create-function-app-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/create-serverless-logic-with-azure-functions/6-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/azure/azure-functions/functions-create-function-app-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/intro-azure-functions/index.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/azure-functions/functions-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/intro-azure-functions/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/azure-functions/functions-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/intro-azure-functions/2-what-azure-functions.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/azure-functions/functions-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/intro-azure-functions/3-how-azure-functions-works.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/azure-functions/functions-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/intro-azure-functions/4-when-use-azure-functions.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/azure-functions/functions-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/intro-azure-functions/5-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/en-us/azure/azure-functions/functions-overview",
+      "redirect_document_id": false
+    },
+    {
+      "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
@@ -7575,6 +7585,26 @@ achievements:
   title: Work with Data Warehouses using Azure Synapse Analytics
   summary: Learn to work with Data Warehouses using Azure Synapse Analytics
   iconUrl: /training/achievements/work-with-data-warehouses-using-azure-synapse-analytics-social.png
+- uid: learn.create-serverless-applications.trophy
+  type: trophy
+  title: Create serverless applications
+  summary: Azure Functions enable the creation of event driven, compute-on-demand systems that can be triggered by various external events. Learn how to leverage functions to execute server-side logic and build serverless architectures.
+  iconUrl: /training/achievements/create-serverless-applications.svg
+- uid: learn.create-serverless-logic-with-functions.badge
+  type: badge
+  title: Create serverless logic with Azure Functions
+  summary: Azure Functions allows developers to host business logic that can be executed without managing or provisioning infrastructure. 
+  iconUrl: /training/achievements/create-serverless-logic-with-azure-functions.svg
+- uid: learn.intro-azure-functions.badge
+  type: badge
+  title: Introduction to Azure Functions
+  summary: Learn how Azure Functions helps you to easily integrate serverless compute resources into your cloud-based solutions. An extensive set of bindings makes it easy for you to connect your code to key Azure services, while built-in support for the most used development languages lets you better use your existing skills.
+  iconUrl: /training/achievements/generic-badge.svg 
+- uid: learn.architect-messaging-serverless.trophy
+  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
 - uid: learn.wwl.describe-verified-id-concepts.badge
   type: badge 
   title: Describe Microsoft Entra Verified ID concepts
@@ -7599,4 +7629,4 @@ achievements:
   type: trophy 
   title: Build applications with Azure DevOps learning path
   summary: Azure DevOps enables you to build, test, and deploy any application to any cloud or on premises. Learn how to configure build pipelines that continuously build, test, and verify your applications.
-  iconUrl: /training/achievements/azure-devops/build-applications-with-azure-devops.svg 
+  iconUrl: /training/achievements/azure-devops/build-applications-with-azure-devops.svg