DOC-12642 Improve XDCR content for conflict resolution and convergence

modules/learn/pages/clusters-and-availability/xdcr-conflict-resolution.adoc

@@ -1,5 +1,5 @@
 = XDCR Conflict Resolution
-:description: pass:q[_XDCR Conflict Resolution_ automatically synchronizes document-copies that have been modified in different ways at different locations.]
+:description: pass:q[XDCR Conflict Resolution automatically synchronizes document-copies that have been modified in different ways at different locations.]
 :page-aliases: xdcr:xdcr-conflict-resolution,xdcr:xdcr-timestamp-based-conflict-resolution
 
 [abstract]

preview/DOC-12642.yml

@@ -0,0 +1,28 @@
+sources:
+    docs-server:
+      branches: DOC-12642-content-improvement-xdcr-cr-convergence
+    docs-analytics:
+      branches: release/8.0
+    docs-devex:
+      url: https://github.com/couchbaselabs/docs-devex.git
+      branches: master
+      startPaths: docs/
+    couchbase-cli:
+      # url: ../../docs-includes/couchbase-cli
+      url: https://github.com/couchbaselabs/couchbase-cli-doc
+      # branches: HEAD
+      branches: master
+      startPaths: docs/
+    backup:
+      # url: ../../docs-includes/backup
+      url: https://github.com/couchbaselabs/backup-docs.git
+      #branches: HEAD
+      branches: master
+      startPaths: docs/    
+    #analytics:
+    #  url: ../../docs-includes/docs-analytics
+    #  branches: HEAD
+    #cb-swagger:
+    #  url: https://github.com/couchbaselabs/cb-swagger
+    #  branches: release/8.0
+    #  start_path: docs