Resolve conflict.

Author: TimShererWithAquent

.openpublishing.publish.config.json

@@ -961,6 +961,7 @@
   ".openpublishing.redirection.azure-australia.json",
   ".openpublishing.redirection.azure-databricks.json",
   ".openpublishing.redirection.azure-hpc.json",
+  ".openpublishing.redirection.azure-kubernetes-service.json",
   ".openpublishing.redirection.azure-monitor.json",
   ".openpublishing.redirection.azure-percept.json",
   ".openpublishing.redirection.azure-productivity.json",
@@ -982,6 +983,7 @@
   ".openpublishing.redirection.security-benchmark.json",
   ".openpublishing.redirection.sql-database.json",
   ".openpublishing.redirection.virtual-desktop.json",
+  ".openpublishing.redirection.devops-project.json",
   "articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
   "articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
   "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",

.openpublishing.redirection.active-directory.json

@@ -75,6 +75,11 @@
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/teamzskill-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/saas-apps/usertesting-tutorial.md",
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",

.openpublishing.redirection.azure-kubernetes-service.json

@@ -0,0 +1,9 @@
+{
+    "redirections": [    
+        {
+            "source_path_from_root": "/articles/aks/stop-api-upgrade.md",
+            "redirect_url": "/azure/aks/upgrade-cluster",
+            "redirect_document_id": false
+        }
+    ]
+}

.openpublishing.redirection.azure-monitor.json

@@ -5812,6 +5812,16 @@
             "redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/logs/logicapp-flow-connector.md",
+            "redirect_url": "/azure/connectors/connectors-azure-monitor-logs",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/automate-with-logic-apps.md",
+            "redirect_url": "/azure/connectors/connectors-azure-application-insights",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/insights/solutions.md",
             "redirect_url": "/previous-versions/azure/azure-monitor/insights/solutions",

.openpublishing.redirection.devops-project.json

@@ -0,0 +1,119 @@
+{
+    "redirections": [
+        {
+            "source_path": "articles/devops-project/azure-devops-project-aks.md",
+            "redirect_url": "/previous-versions/azure/devops-project/azure-devops-project-aks",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/azure-devops-project-aspnet-core.md",
+            "redirect_url": "/previous-versions/azure/devops-project/azure-devops-project-aspnet-core",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/azure-devops-project-cosmos-db.md",
+            "redirect_url": "/previous-versions/azure/devops-project/azure-devops-project-cosmos-db",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/azure-devops-project-functions.md",
+            "redirect_url": "/previous-versions/azure/devops-project/azure-devops-project-functions",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/azure-devops-project-github.md",
+            "redirect_url": "/previous-versions/azure/devops-project/azure-devops-project-github",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/azure-devops-project-go.md",
+            "redirect_url": "/previous-versions/azure/devops-project/azure-devops-project-go",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/azure-devops-project-java.md",
+            "redirect_url": "/previous-versions/azure/devops-project/azure-devops-project-java",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/azure-devops-project-nodejs.md",
+            "redirect_url": "/previous-versions/azure/devops-project/azure-devops-project-nodejs",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/azure-devops-project-php.md",
+            "redirect_url": "/previous-versions/azure/devops-project/azure-devops-project-php",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/azure-devops-project-python.md",
+            "redirect_url": "/previous-versions/azure/devops-project/azure-devops-project-python",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/azure-devops-project-ruby.md",
+            "redirect_url": "/previous-versions/azure/devops-project/azure-devops-project-ruby",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/azure-devops-project-service-fabric.md",
+            "redirect_url": "/previous-versions/azure/devops-project/azure-devops-project-service-fabric",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/azure-devops-project-sql-database.md",
+            "redirect_url": "/previous-versions/azure/devops-project/azure-devops-project-sql-database",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/azure-devops-project-vms.md",
+            "redirect_url": "/previous-versions/azure/devops-project/azure-devops-project-vms",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/devops-starter-gh-nodejs.md",
+            "redirect_url": "/previous-versions/azure/devops-project/devops-starter-gh-nodejs",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/devops-starter-gh-web-app.md",
+            "redirect_url": "/previous-versions/azure/devops-project/devops-starter-gh-web-app",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/overview.md",
+            "redirect_url": "/previous-versions/azure/devops-project/overview",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/index.md",
+            "redirect_url": "/previous-versions/azure/devops-project/overview",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/devops-project/retirement-and-migration.md",
+            "redirect_url": "/previous-versions/azure/devops-project/retirement-and-migration",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/virtual-machines/linux/tutorial-azure-devops-blue-green-strategy.md",
+            "redirect_url": "/previous-versions/azure/virtual-machines/linux/tutorial-azure-devops-blue-green-strategy",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/virtual-machines/linux/tutorial-azure-devops-canary-strategy.md",
+            "redirect_url": "/previous-versions/azure/virtual-machines/linux/tutorial-azure-devops-canary-strategy",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/virtual-machines/linux/tutorial-build-deploy-azure-pipelines.md",
+            "redirect_url": "/previous-versions/azure/virtual-machines/linux/tutorial-build-deploy-azure-pipelines",
+            "redirect_document_id": false
+          },
+          {
+            "source_path": "articles/aks/deployment-center-launcher.md",
+            "redirect_url": "/previous-versions/azure/aks/deployment-center-launcher",
+            "redirect_document_id": false
+          }          
+    ]
+  }

.openpublishing.redirection.json

@@ -22376,6 +22376,11 @@
             "redirect_url": "/azure/azure-arc/kubernetes/overview",
             "redirect_document_id": "false"
         },
+        {
+            "source_path_from_root": "/articles/azure-arc/kubernetes/tutorial-workload-management.md",
+            "redirect_url": "/azure/azure-arc/kubernetes/workload-management",
+            "redirect_document_id": "true"
+        },
         {
           "source_path": "articles/azure-cache-for-redis/redis-cache-insights-overview.md",
           "redirect_url": "/azure/azure-cache-for-redis/cache-insights-overview",