Fix merge conflicts

Author: gitName

.openpublishing.redirection.json

@@ -47389,6 +47389,81 @@
       "redirect_url": "/training/modules/deploy-message-encryption-microsoft-365/summary",
       "redirect_document_id": false
     },
+    {
+      "source_path": "learn-pr/sqlserver/use-sql-server-query-tuning-assistant/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/?filter-products=sql&products=azure-sql-database",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/sqlserver/use-sql-server-query-tuning-assistant/2-decide-qta-right.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/?filter-products=sql&products=azure-sql-database",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/sqlserver/use-sql-server-query-tuning-assistant/3-get-started-qta.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/?filter-products=sql&products=azure-sql-database",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/sqlserver/use-sql-server-query-tuning-assistant/4-tune-queries-qta.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/?filter-products=sql&products=azure-sql-database",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/sqlserver/use-sql-server-query-tuning-assistant/5-knowledge-check.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/?filter-products=sql&products=azure-sql-database",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/sqlserver/use-sql-server-query-tuning-assistant/6-module-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/?filter-products=sql&products=azure-sql-database",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/sqlserver/use-sql-server-query-tuning-assistant/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/?filter-products=sql&products=azure-sql-database",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-replication/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/?filter-products=sql&products=azure-sql-database",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-replication/2-track-data-changes-with-cdc.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/?filter-products=sql&products=azure-sql-database",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-replication/3-exercise-track-data-changes-with-cdc.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/?filter-products=sql&products=azure-sql-database",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-replication/4-check-if-data-changes-happened-with-change-tracking.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/?filter-products=sql&products=azure-sql-database",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-replication/5-exercise-check-if-data-changes-happened-with-change-tracking.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/?filter-products=sql&products=azure-sql-database",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-replication/6-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/?filter-products=sql&products=azure-sql-database",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-replication/7-knowledge-check.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/?filter-products=sql&products=azure-sql-database",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/azure-sql-replication/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/?filter-products=sql&products=azure-sql-database",
+      "redirect_document_id": false
+    },
     {
       "source_path": "learn-pr/azure/backup-restore-azure-sql/1-introduction.yml",
       "redirect_url": "https://learn.microsoft.com/training/browse/?filter-products=sql&products=azure-sql-database",

learn-pr/achievements.yml

@@ -5720,3 +5720,13 @@ achievements:
   title: Architect modern applications using Azure SQL Database
   summary: Break down a scenario for an application and build a multi-service solution based on the microservices approach. Learn how to use modern database capabilities to build a foundation for applications.
   iconUrl: /training/achievements/create-foundation-modern-apps.svg
+- uid: learn-sqlserver.use-sql-server-query-tuning-assistant.badge
+  type: badge
+  title: Use the SQL Server Query Tuning Assistant
+  summary: Learn how the Query Tuning Assistant (QTA) works alongside the Query Store to compare query performance statistics and find queries that are regressing due to changing compatibility levels.
+  iconUrl: /training/achievements/sqlserver/using-the-sql-server-query-tuning-assistant.svg
+- uid: learn.azure-sql-replication.badge
+  type: badge
+  title: Data tracking and synchronization with Azure SQL Database
+  summary: "This module introduces you to several data tracking, loading, and streaming tools that you can use to track or synchronize data changes from your Azure SQL Database to other destinations. More specifically, we cover: change data capture (CDC) and change tracking."
+  iconUrl: /training/achievements/learn-azure-sql-replication.svg

learn-pr/achievements/explore-microsoft-dev-box-deployment-guidelines-best-practices-social.png

@@ -1,15 +1,15 @@
-### YamlMime:ModuleUnit
-uid: learn.azdo.create-multi-stage-pipeline.1-introduction
-title: Introduction
-metadata:
-  title: Introduction
-  description: Introduction
-  ms.custom: devdivchpfy22
-  ms.date: 11/29/2023
-  author: juliakm
-  ms.author: jukullam
-  ms.topic: unit
-durationInMinutes: 1
-content: |
-  [!include[](includes/1-introduction.md)]
-
+### YamlMime:ModuleUnit
+uid: learn.azdo.create-multi-stage-pipeline.1-introduction
+title: Introduction
+metadata:
+  title: Introduction
+  description: Introduction
+  ms.custom: devdivchpfy22
+  ms.date: 05/01/2025
+  author: juliakm
+  ms.author: jukullam
+  ms.topic: unit
+durationInMinutes: 1
+content: |
+  [!include[](includes/1-introduction.md)]
+

learn-pr/achievements/explore-microsoft-dev-box-deployment-guidelines-best-practices.svg

@@ -1,51 +1,51 @@
-### YamlMime:ModuleUnit
-uid: learn.azdo.create-multi-stage-pipeline.2-design-the-pipeline
-title: Design the pipeline
-metadata:
-  title: Design the pipeline
-  description: Define stages in your release pipeline and promote changes from one stage to the next.
-  ms.custom: devdivchpfy22
-  ms.date: 11/29/2023
-  author: juliakm
-  ms.author: jukullam
-  ms.topic: unit
-durationInMinutes: 11
-content: |
-  [!include[](includes/2-design-the-pipeline.md)]
-quiz:
-  title: Check your knowledge
-  questions:
-  - content: "Your pipeline includes many tests and quality checks that take several minutes to finish. Which kind of trigger is best for running tests only on code that was peer reviewed?"
-    choices:
-    - content: "A build completion trigger"
-      isCorrect: false
-      explanation: "A build completion trigger runs a build when another build, such as one for a dependent component, finishes successfully."
-    - content: "A CI trigger or PR trigger"
-      isCorrect: true
-      explanation: "Use CI and PR triggers to control which branches participate in the overall process. You can use them to run your pipeline only during a pull request or after a pull request is merged into a certain branch, such as `main` or a release branch."
-    - content: "A scheduled trigger"
-      isCorrect: false
-      explanation: "Although you can use a scheduled trigger to run tests regularly, is there a better way to run tests only when they're needed?"
-  - content: "What's the best way to pause the pipeline until an approver signs off on a change?"
-    choices:
-    - content: "Use a release approval."
-      isCorrect: true
-      explanation: "A release approval pauses the pipeline until an approver accepts or rejects the release."
-    - content: "Install a Marketplace extension that provides Azure Pipelines tasks that can pause the pipeline."
-      isCorrect: false
-      explanation: "Although you might find an extension that can fulfill your need, can you use a built-in mechanism instead?"
-    - content: "Ask your approver to look at the change. Then manually trigger the pipeline to run."
-      isCorrect: false
-      explanation: "Is there an automated way to allow the approver to see the working software and then promote it to the next stage?"
-  - content: "You want to deploy your web app to the _Test_ environment each time a build finishes. What's the easiest way to set up the process?"
-    choices:
-    - content: "Use a scheduled trigger."
-      isCorrect: false
-      explanation: "Although a scheduled trigger enables you to build your web app and pick up the latest dependencies on a regular schedule, it doesn't trigger your pipeline to run when a build finishes."
-    - content: "Watch for build notification emails and manually trigger your build when the other one finishes successfully."
-      isCorrect: false
-      explanation: "This method is inefficient. Is there a way to trigger the build automatically?"
-    - content: "Use a build completion trigger."
-      isCorrect: true
-      explanation: "A build completion trigger runs a build when another build, such as one for a dependent component, finishes successfully."
-
+### YamlMime:ModuleUnit
+uid: learn.azdo.create-multi-stage-pipeline.2-design-the-pipeline
+title: Design the pipeline
+metadata:
+  title: Design the pipeline
+  description: Define stages in your release pipeline and promote changes from one stage to the next.
+  ms.custom: devdivchpfy22
+  ms.date: 05/01/2025
+  author: juliakm
+  ms.author: jukullam
+  ms.topic: unit
+durationInMinutes: 11
+content: |
+  [!include[](includes/2-design-the-pipeline.md)]
+quiz:
+  title: Check your knowledge
+  questions:
+  - content: "Your pipeline includes many tests and quality checks that take several minutes to finish. Which kind of trigger is best for running tests only on code that was peer reviewed?"
+    choices:
+    - content: "A build completion trigger"
+      isCorrect: false
+      explanation: "A build completion trigger runs a build when another build, such as one for a dependent component, finishes successfully."
+    - content: "A CI trigger or PR trigger"
+      isCorrect: true
+      explanation: "Use CI and PR triggers to control which branches participate in the overall process. You can use them to run your pipeline only during a pull request or after a pull request is merged into a certain branch, such as `main` or a release branch."
+    - content: "A scheduled trigger"
+      isCorrect: false
+      explanation: "Although you can use a scheduled trigger to run tests regularly, is there a better way to run tests only when they're needed?"
+  - content: "What's the best way to pause the pipeline until an approver signs off on a change?"
+    choices:
+    - content: "Use a release approval."
+      isCorrect: true
+      explanation: "A release approval pauses the pipeline until an approver accepts or rejects the release."
+    - content: "Install a Marketplace extension that provides Azure Pipelines tasks that can pause the pipeline."
+      isCorrect: false
+      explanation: "Although you might find an extension that can fulfill your need, can you use a built-in mechanism instead?"
+    - content: "Ask your approver to look at the change. Then manually trigger the pipeline to run."
+      isCorrect: false
+      explanation: "Is there an automated way to allow the approver to see the working software and then promote it to the next stage?"
+  - content: "You want to deploy your web app to the _Test_ environment each time a build finishes. What's the easiest way to set up the process?"
+    choices:
+    - content: "Use a scheduled trigger."
+      isCorrect: false
+      explanation: "Although a scheduled trigger enables you to build your web app and pick up the latest dependencies on a regular schedule, it doesn't trigger your pipeline to run when a build finishes."
+    - content: "Watch for build notification emails and manually trigger your build when the other one finishes successfully."
+      isCorrect: false
+      explanation: "This method is inefficient. Is there a way to trigger the build automatically?"
+    - content: "Use a build completion trigger."
+      isCorrect: true
+      explanation: "A build completion trigger runs a build when another build, such as one for a dependent component, finishes successfully."
+

learn-pr/azure-devops/create-multi-stage-pipeline/1-introduction.yml

@@ -1,15 +1,15 @@
-### YamlMime:ModuleUnit
-uid: learn.azdo.create-multi-stage-pipeline.3-set-up-environment
-title: Exercise - Set up your Azure DevOps environment
-metadata:
-  title: Exercise - Set up your Azure DevOps environment
-  description: Create your Azure DevOps project and Azure resources.
-  ms.custom: devdivchpfy22, devx-track-azurecli
-  ms.date: 11/29/2023
-  author: juliakm
-  ms.author: jukullam
-  ms.topic: unit
-durationInMinutes: 15
-content: |
-  [!include[](includes/3-set-up-environment.md)]
-
+### YamlMime:ModuleUnit
+uid: learn.azdo.create-multi-stage-pipeline.3-set-up-environment
+title: Exercise - Set up your Azure DevOps environment
+metadata:
+  title: Exercise - Set up your Azure DevOps environment
+  description: Create your Azure DevOps project and Azure resources.
+  ms.custom: devdivchpfy22, devx-track-azurecli
+  ms.date: 05/01/2025
+  author: juliakm
+  ms.author: jukullam
+  ms.topic: unit
+durationInMinutes: 15
+content: |
+  [!include[](includes/3-set-up-environment.md)]
+

learn-pr/azure-devops/create-multi-stage-pipeline/2-design-the-pipeline.yml

@@ -1,15 +1,15 @@
-### YamlMime:ModuleUnit
-uid: learn.azdo.create-multi-stage-pipeline.4-promote-dev
-title: Exercise - Promote to the Dev stage
-metadata:
-  title: Exercise - Promote to the Dev stage
-  description: Promote to the Dev stage by using a build trigger.
-  ms.custom: devdivchpfy22
-  ms.date: 11/29/2023
-  author: juliakm
-  ms.author: jukullam
-  ms.topic: unit
-durationInMinutes: 8
-content: |
-  [!include[](includes/4-promote-dev.md)]
-
+### YamlMime:ModuleUnit
+uid: learn.azdo.create-multi-stage-pipeline.4-promote-dev
+title: Exercise - Promote to the Dev stage
+metadata:
+  title: Exercise - Promote to the Dev stage
+  description: Promote to the Dev stage by using a build trigger.
+  ms.custom: devdivchpfy22
+  ms.date: 05/01/2025
+  author: juliakm
+  ms.author: jukullam
+  ms.topic: unit
+durationInMinutes: 8
+content: |
+  [!include[](includes/4-promote-dev.md)]
+