resolve conflict

Author: b-ahibbard

.acrolinx-config.edn

@@ -1,2 +1,2 @@
 {:allowed-branchname-matches ["main" "release-.*"]
- :allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md))" "includes/"]}
+ :allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/))"]}

.github/workflows/stale.yml

@@ -1,5 +1,9 @@
 name: Mark stale pull requests
 
+permissions:
+  issues: write
+  pull-requests: write
+      
 on:
   schedule:
   - cron: "0 */6 * * *"
@@ -8,7 +12,7 @@ jobs:
   stale:
 
     runs-on: ubuntu-latest
-
+   
     steps:
     - uses: actions/stale@v3
       with:

.openpublishing.publish.config.json

@@ -998,12 +998,36 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "cosmos-db-nosql-nodejs-quickstart",
+      "url": "https://github.com/azure-samples/cosmos-db-nosql-nodejs-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "cosmos-db-nosql-python-samples",
       "url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "cosmos-db-nosql-python-quickstart",
+      "url": "https://github.com/azure-samples/cosmos-db-nosql-python-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cosmos-db-nosql-java-quickstart",
+      "url": "https://github.com/azure-samples/cosmos-db-nosql-java-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cosmos-db-nosql-go-quickstart",
+      "url": "https://github.com/azure-samples/cosmos-db-nosql-go-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "cosmos-db-mongodb-dotnet-samples",
       "url": "https://github.com/azure-samples/cosmos-db-mongodb-dotnet-samples",
@@ -1169,6 +1193,7 @@
     "name": "docfx_v3"
   },
   "redirection_files": [
+  ".openpublishing.redirection.json",
   ".openpublishing.redirection.active-directory.json",
   ".openpublishing.redirection.api-management.json",
   ".openpublishing.redirection.app-service.json",
@@ -1187,24 +1212,30 @@
   ".openpublishing.redirection.azure-vmware.json",
   ".openpublishing.redirection.azure-web-pubsub.json",
   ".openpublishing.redirection.baremetal-infrastructure.json",
+  ".openpublishing.redirection.container-service.json",
   ".openpublishing.redirection.defender-for-cloud.json",
   ".openpublishing.redirection.defender-for-iot.json",
+  ".openpublishing.redirection.devops-project.json",
+  ".openpublishing.redirection.guidance.json",
   ".openpublishing.redirection.iot-hub-device-update.json",
-  ".openpublishing.redirection.json",
   ".openpublishing.redirection.key-vault.json",
   ".openpublishing.redirection.machine-configuration.json",
+  ".openpublishing.redirection.marketplace.json",
   ".openpublishing.redirection.openshift.json",
   ".openpublishing.redirection.security-benchmark.json",
+  ".openpublishing.redirection.sentinel.json",
+  ".openpublishing.redirection.spring-cloud.json",
   ".openpublishing.redirection.sql-database.json",
   ".openpublishing.redirection.virtual-desktop.json",
-  ".openpublishing.redirection.devops-project.json",
-  ".openpublishing.redirection.sentinel.json",
+  "articles/active-directory-b2c/.openpublishing.redirection.active-directory-b2c.json",
   "articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json",
   "articles/ai-services/.openpublishing.redirection.ai-services-from-cog.json",
   "articles/ai-services/.openpublishing.redirection.applied-ai-old.json",
   "articles/ai-services/.openpublishing.redirection.applied-ai-services.json",
   "articles/ai-services/.openpublishing.redirection.cognitive-services.json",
+  "articles/ai-studio/.openpublishing.redirection.ai-studio.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",
@@ -1221,8 +1252,13 @@
   "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/governance/policy/.openpublishing.redirection.policy.json",
+  "articles/governance/policy/.openpublishing.redirection.resource-graph.json",
+  "articles/governance/blueprints/.openpublishing.redirection.blueprints.json",
+  "articles/governance/management-groups/.openpublishing.redirection.management-groups.json",
   "articles/hdinsight/.openpublishing.redirection.hdinsight.json",
   "articles/hdinsight-aks/.openpublishing.redirection.hdinsight-aks.json",
   "articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",
@@ -1235,30 +1271,32 @@
   "articles/iot/.openpublishing.redirection.iot.json",
   "articles/iot-hub/.openpublishing.redirection.iot-hub.json",
   "articles/iot-operations/.openpublishing.redirection.iot-operations.json",
+  "articles/lab-services/.openpublishing.redirection.lab-services.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/mariadb/.openpublishing.redirection.mariadb.json",
-  "articles/marketplace/.openpublishing.redirection.marketplace.json",
   "articles/mysql/.openpublishing.redirection.mysql.json",
   "articles/network-watcher/.openpublishing.redirection.network-watcher.json",
   "articles/object-anchors/.openpublishing.redirection.object-anchors.json",
+  "articles/operator-nexus/.openpublishing.redirection.operator-nexus.json",
   "articles/peering-service/.openpublishing.redirection.peering-service.json",
   "articles/postgresql/.openpublishing.redirection.postgresql.json",
   "articles/purview/.openpublishing.redirection.purview.json",
   "articles/route-server/.openpublishing.redirection.route-server.json",
   "articles/sap/.openpublishing.redirection.sap.json",
+  "articles/security/.openpublishing.redirection.security.json",
   "articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.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/spring-cloud/.openpublishing.redirection.spring-cloud.json",
   "articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
   "articles/storsimple/.openpublishing.redirection.storsimple.json",
   "articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
   "articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
   "articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
   "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
-  "articles/operator-nexus/.openpublishing.redirection.operator-nexus.json"
+  "articles/virtual-network/.openpublishing.redirection.virtual-network.json"
 ]
 }