From f2337084ba51db7854d7713fa288aeebe3901221 Mon Sep 17 00:00:00 2001 From: Shwetha Rao Date: Fri, 10 Oct 2025 12:00:07 +0530 Subject: [PATCH 1/2] whats new entry for auto resolve conflicts --- modules/introduction/partials/new-features-80.adoc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/introduction/partials/new-features-80.adoc b/modules/introduction/partials/new-features-80.adoc index 99752e6cda..984014590c 100644 --- a/modules/introduction/partials/new-features-80.adoc +++ b/modules/introduction/partials/new-features-80.adoc @@ -323,7 +323,10 @@ Incremental backups now keep track of which backups they depend on. You cannot delete a backup if another incremental backup needs it, however, you can choose to override this protection from the UI and REST API. For more information, see xref:manage:manage-backup-and-restore/manage-backup-and-restore.adoc#delete-backups[Delete Backups]. - +https://jira.issues.couchbase.com/browse/MB-66173[MB-66173]: Automatically resolve name conflicts during a backup restore:: +Automated the process of resolving name conflicts between collections or scopes in the backup and those in the target cluster, during a restore. +For this purpose, added a new flag, `--auto-resolve-conflicts` to the `cbbackupmgr restore` parameter. +For more information, see xref:backup-restore:cbbackupmgr-restore.adoc[cbbackupmgr restore]. [#section-new-feature-800-XDCR] From d865346c351e1e2dc4cac8782db6516e53e74066 Mon Sep 17 00:00:00 2001 From: rao-shwe Date: Fri, 10 Oct 2025 16:35:47 +0530 Subject: [PATCH 2/2] Implemented peer review feedback Co-authored-by: Ray Offiah <77050471+RayOffiah@users.noreply.github.com> --- modules/introduction/partials/new-features-80.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/introduction/partials/new-features-80.adoc b/modules/introduction/partials/new-features-80.adoc index 984014590c..80e6c4af2f 100644 --- a/modules/introduction/partials/new-features-80.adoc +++ b/modules/introduction/partials/new-features-80.adoc @@ -325,7 +325,7 @@ For more information, see xref:manage:manage-backup-and-restore/manage-backup-an https://jira.issues.couchbase.com/browse/MB-66173[MB-66173]: Automatically resolve name conflicts during a backup restore:: Automated the process of resolving name conflicts between collections or scopes in the backup and those in the target cluster, during a restore. -For this purpose, added a new flag, `--auto-resolve-conflicts` to the `cbbackupmgr restore` parameter. +For this purpose, we have added a new flag, `--auto-resolve-conflicts` to the `cbbackupmgr restore` parameter. For more information, see xref:backup-restore:cbbackupmgr-restore.adoc[cbbackupmgr restore].