Fix merge conflict in redirects

Author: cdpark

.openpublishing.publish.config.json

@@ -200,6 +200,42 @@
             "branch": "master",
             "branch_mapping": {}
         },
+        {
+          "path_to_root": "functions-quickstart-dotnet-azd",
+          "url": "https://github.com/Azure-Samples/functions-quickstart-dotnet-azd",
+          "branch": "main",
+          "branch_mapping": {}
+        },
+        {
+          "path_to_root": "functions-quickstart-java-azd",
+          "url": "https://github.com/Azure-Samples/azure-functions-java-flex-consumption-azd",
+          "branch": "main",
+          "branch_mapping": {}
+        },
+        {
+          "path_to_root": "functions-quickstart-python-azd",
+          "url": "https://github.com/Azure-Samples/functions-quickstart-python-http-azd",
+          "branch": "main",
+          "branch_mapping": {}
+        },
+        {
+          "path_to_root": "functions-quickstart-powershell-azd",
+          "url": "https://github.com/Azure-Samples/functions-quickstart-powershell-azd",
+          "branch": "main",
+          "branch_mapping": {}
+        },
+        {
+          "path_to_root": "functions-quickstart-javascript-azd",
+          "url": "https://github.com/Azure-Samples/functions-quickstart-javascript-azd",
+          "branch": "main",
+          "branch_mapping": {}
+        },
+        {
+          "path_to_root": "functions-quickstart-typescript-azd",
+          "url": "https://github.com/Azure-Samples/functions-quickstart-typescript-azd",
+          "branch": "main",
+          "branch_mapping": {}
+        },
         {
             "path_to_root": "azure-functions-templates-v3",
             "url": "https://github.com/Azure/azure-functions-templates",
@@ -560,6 +596,12 @@
             "branch": "main",
             "branch_mapping": {}
         },
+        {
+            "path_to_root": "msdocs-spring-boot-mongodb-sample-app",
+            "url": "https://github.com/Azure-Samples/msdocs-spring-boot-mongodb-sample-app",
+            "branch": "main",
+            "branch_mapping": {}
+        },
         {
             "path_to_root": "msdocs-tomcat-mysql-sample-app",
             "url": "https://github.com/Azure-Samples/msdocs-tomcat-mysql-sample-app",
@@ -711,150 +753,5 @@
     },
     "docs_build_engine": {
         "name": "docfx_v3"
-    },
-    "redirection_files": [
-        ".openpublishing.redirection.active-directory.json",
-        ".openpublishing.redirection.ai-services-from-applied.json",
-        ".openpublishing.redirection.ai-services-from-cog.json",
-        ".openpublishing.redirection.applied-ai-old.json",
-        ".openpublishing.redirection.applied-ai-services.json",
-        ".openpublishing.redirection.ansible.json",
-        ".openpublishing.redirection.api-center.json",
-        ".openpublishing.redirection.api-management.json",
-        ".openpublishing.redirection.app-service.json",
-        ".openpublishing.redirection.asc-for-iot.json",
-        ".openpublishing.redirection.availability-zones.json",
-        ".openpublishing.redirection.azure-app-configuration.json",
-        ".openpublishing.redirection.azure-arc-data.json",
-        ".openpublishing.redirection.azure-australia.json",
-        ".openpublishing.redirection.azure-databricks.json",
-        ".openpublishing.redirection.azure-datalake-storage-gen1.json",
-        ".openpublishing.redirection.azure-hpc.json",
-        ".openpublishing.redirection.azure-monitor.json",
-        ".openpublishing.redirection.azure-percept.json",
-        ".openpublishing.redirection.azure-productivity.json",
-        ".openpublishing.redirection.azure-resource-manager.json",
-        ".openpublishing.redirection.azure-stack.json",
-        ".openpublishing.redirection.azure-vmware.json",
-        ".openpublishing.redirection.azure-web-pubsub.json",
-        ".openpublishing.redirection.baremetal-infrastructure.json",
-        ".openpublishing.redirection.blockchain.json",
-        ".openpublishing.redirection.cognitive-services.json",
-        ".openpublishing.redirection.container-service.json",
-        ".openpublishing.redirection.data-lake-analytics.json",
-        ".openpublishing.redirection.defender-for-iot.json",
-        ".openpublishing.redirection.dev-spaces.json",
-        ".openpublishing.redirection.devops-project.json",
-        ".openpublishing.redirection.dms.json",
-        ".openpublishing.redirection.document-db.json",
-        ".openpublishing.redirection.germany.json",
-        ".openpublishing.redirection.government.json",
-        ".openpublishing.redirection.guidance.json",
-        ".openpublishing.redirection.industry.json",
-        ".openpublishing.redirection.iot-accelerators.json",
-        ".openpublishing.redirection.iot-develop.json",
-        ".openpublishing.redirection.iot-hub-device-update.json",
-        ".openpublishing.redirection.json",
-        ".openpublishing.redirection.machine-configuration.json",
-        ".openpublishing.redirection.marketplace.json",
-        ".openpublishing.redirection.openshift.json",
-        ".openpublishing.redirection.private-multi-access-edge-compute-mec.json",
-        ".openpublishing.redirection.purview.json",
-        ".openpublishing.redirection.remoteapp.json",
-        ".openpublishing.redirection.security-benchmark.json",
-        ".openpublishing.redirection.security-center.json",
-        ".openpublishing.redirection.sentinel.json",
-        ".openpublishing.redirection.service-fabric-mesh.json",
-        ".openpublishing.redirection.spring-cloud.json",
-        ".openpublishing.redirection.sql-data-warehouse.json",
-        ".openpublishing.redirection.sql-database.json",
-        ".openpublishing.redirection.terraform.json",
-        ".openpublishing.redirection.update-center.json",
-        ".openpublishing.redirection.virtual-desktop.json",
-        ".openpublishing.redirection.vmware-cloudsimple.json",
-        "articles/active-directory-b2c/.openpublishing.redirection.active-directory-b2c.json",
-        "articles/ai-services.openpublishing.redirection.ai-services.json",
-        "articles/ai-studio/.openpublishing.redirection.ai-studio.json",
-        "articles/analysis-services/.openpublishing.redirection.analysis-services.json",
-        "articles/application-gateway/.openpublishing.redirection.application-gateway.json",
-        "articles/automation/.openpublishing.redirection.automation.json",
-        "articles/azure-arc/.openpublishing.redirection.azure-arc.json",
-        "articles/azure-cache-for-redis/.openpublishing.redirection.redis-cache.json",
-        "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
-        "articles/azure-functions/.openpublishing.redirection.azure-functions.json",
-        "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
-        "articles/azure-relay/.openpublishing.redirection.relay.json",
-        "articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
-        "articles/backup/.openpublishing.redirection.backup.json",
-        "articles/batch/.openpublishing.redirection.batch.json",
-        "articles/cloud-services/.openpublishing.redirection.cloud-services.json",
-        "articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
-        "articles/communication-services/.openpublishing.redirection.communication-services.json",
-        "articles/communications-gateway/.openpublishing.redirection.communications-gateway.json",
-        "articles/confidential-computing/.openpublishing.redirection.json",
-        "articles/container-apps/.openpublishing.redirection.container-apps.json",
-        "articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
-        "articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
-        "articles/data-catalog/.openpublishing.redirection.data-catalog.json",
-        "articles/data-factory/.openpublishing.redirection.data-factory.json",
-        "articles/databox-online/.openpublishing.redirection.databox-online.json",
-        "articles/deployment-environments/.openpublishing.redirection.deployment-environments.json",
-        "articles/dev-box/.openpublishing.redirection.dev-box.json",
-        "articles/digital-twins/.openpublishing.redirection.digital-twins.json",
-        "articles/energy-data-services/.openpublishing.redirection.energy-data-services.json",
-        "articles/event-grid/.openpublishing.redirection.event-grid.json",
-        "articles/event-hubs/.openpublishing.redirection.event-hubs.json",
-        "articles/frontdoor/.openpublishing.redirection.frontdoor.json",
-        "articles/governance/blueprints/.openpublishing.redirection.blueprints.json",
-        "articles/governance/management-groups/.openpublishing.redirection.management-groups.json",
-        "articles/governance/policy/.openpublishing.redirection.policy.json",
-        "articles/governance/policy/.openpublishing.redirection.resource-graph.json",
-        "articles/hdinsight-aks/.openpublishing.redirection.hdinsight-aks.json",
-        "articles/hdinsight/.openpublishing.redirection.hdinsight.json",
-        "articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",
-        "articles/internet-peering/.openpublishing.redirection.internet-peering.json",
-        "articles/iot-central/.openpublishing.redirection.iot-central.json",
-        "articles/iot-dps/.openpublishing.redirection.iot-dps.json",
-        "articles/iot-edge/.openpublishing.redirection.iot-edge.json",
-        "articles/iot-hub/.openpublishing.redirection.iot-hub.json",
-        "articles/iot-operations/.openpublishing.redirection.iot-operations.json",
-        "articles/iot/.openpublishing.redirection.iot.json",
-        "articles/lab-services/.openpublishing.redirection.lab-services.json",
-        "articles/load-balancer/.openpublishing.redirection.load-balancer.json",
-        "articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
-        "articles/logic-apps/.openpublishing.redirection.logic-apps.json",
-        "articles/machine-learning/.openpublishing.redirection.machine-learning.json",
-        "articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",
-        "articles/managed-instance-apache-cassandra/.openpublishing.redirection.managed-instance-apache-cassandra.json",
-        "articles/mariadb/.openpublishing.redirection.mariadb.json",
-        "articles/migrate/.openpublishing.redirection.migrate.json",
-        "articles/mysql/.openpublishing.redirection.mysql.json",
-        "articles/network-watcher/.openpublishing.redirection.network-watcher.json",
-        "articles/networking/.openpublishing.redirection.networking.json",
-        "articles/object-anchors/.openpublishing.redirection.object-anchors.json",
-        "articles/operator-insights/.openpublishing.redirection.operator-insights.json",
-        "articles/operator-nexus/.openpublishing.redirection.operator-nexus.json",
-        "articles/operator-service-manager/.openpublishing.redirection.operator-service-manager.json",
-        "articles/peering-service/.openpublishing.redirection.peering-service.json",
-        "articles/postgresql/.openpublishing.redirection.postgresql.json",
-        "articles/route-server/.openpublishing.redirection.route-server.json",
-        "articles/sap/.openpublishing.redirection.sap.json",
-        "articles/search/.openpublishing.redirection.search.json",
-        "articles/security/.openpublishing.redirection.security.json",
-        "articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
-        "articles/service-fabric/.openpublishing.redirection.service-fabric.json",
-        "articles/site-recovery/.openpublishing.redirection.site-recovery.json",
-        "articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
-        "articles/spring-apps/.openpublishing.redirection.spring-apps.json",
-        "articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
-        "articles/storage/.openpublishing.redirection.storage.json",
-        "articles/storsimple/.openpublishing.redirection.storsimple.json",
-        "articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
-        "articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
-        "articles/time-series-insights/.openpublishing.redirection.time-series-insights.json",
-        "articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
-        "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
-        "articles/virtual-network/.openpublishing.redirection.virtual-network.json",
-        "articles/vpn-gateway/.openpublishing.redirection.vpn-gateway.json"
-    ]
-}
+    }
+}