From 0ec561d3786bcdd32592aae41f75d6551ebb1bb3 Mon Sep 17 00:00:00 2001 From: Shwetha Rao Date: Fri, 5 Dec 2025 14:05:59 +0530 Subject: [PATCH 1/3] First commit to publish the branch --- .../clusters-and-availability/xdcr-conflict-resolution.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/learn/pages/clusters-and-availability/xdcr-conflict-resolution.adoc b/modules/learn/pages/clusters-and-availability/xdcr-conflict-resolution.adoc index 9c5c644916..4878ac914a 100644 --- a/modules/learn/pages/clusters-and-availability/xdcr-conflict-resolution.adoc +++ b/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] From 270c5c998ccd49793fbbecd76b3db8b84f9036a7 Mon Sep 17 00:00:00 2001 From: Shwetha Rao Date: Fri, 5 Dec 2025 14:49:28 +0530 Subject: [PATCH 2/3] docs preview file --- preview/DOC-14642.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 preview/DOC-14642.yml diff --git a/preview/DOC-14642.yml b/preview/DOC-14642.yml new file mode 100644 index 0000000000..031a83258c --- /dev/null +++ b/preview/DOC-14642.yml @@ -0,0 +1,28 @@ +sources: + docs-server: + branches: DOC-14642 + 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 From dd0a31a71c41793133f83834341413d867594557 Mon Sep 17 00:00:00 2001 From: Shwetha Rao Date: Fri, 5 Dec 2025 14:50:35 +0530 Subject: [PATCH 3/3] docs preview test1 --- preview/{DOC-14642.yml => DOC-12642.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename preview/{DOC-14642.yml => DOC-12642.yml} (92%) diff --git a/preview/DOC-14642.yml b/preview/DOC-12642.yml similarity index 92% rename from preview/DOC-14642.yml rename to preview/DOC-12642.yml index 031a83258c..b925fd9652 100644 --- a/preview/DOC-14642.yml +++ b/preview/DOC-12642.yml @@ -1,6 +1,6 @@ sources: docs-server: - branches: DOC-14642 + branches: DOC-12642-content-improvement-xdcr-cr-convergence docs-analytics: branches: release/8.0 docs-devex: