From 97b68854b9f8766d5233720c256576391074f85e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20D=C4=85browski?= <64841871+dabrt@users.noreply.github.com> Date: Tue, 11 Jun 2024 12:57:57 +0200 Subject: [PATCH] Add informarion about where conflicts originate from --- docs/content_management/content_versions.md | 11 ++++++++--- .../workflow_management/work_with_versions.md | 7 ++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/content_management/content_versions.md b/docs/content_management/content_versions.md index 9036c353..7bc5d091 100644 --- a/docs/content_management/content_versions.md +++ b/docs/content_management/content_versions.md @@ -32,11 +32,16 @@ Drafts can be created in many ways, including: - by the [autosave](#autosave) feature - by reviewers, as part of the [editorial workflow](workflow_management/editorial_workflow.md) -- by editors, when they close a content item's editing screen after making changes, but without publishing them +- by editors, when they save a content item while editing it or close a content item's editing screen after making changes, but without publishing them -For more information, see [Work with versions](work_with_versions.md). +#### Draft conflicts -#### Autosave +Drafts of the same content item that originate from different sources can contain conflicting changes. +Such draft conflicts can be resolved by using the [Version Compare](work_with_versions.md#compare-versions) feature. + +For more information about various operations on content versions, see [Work with versions](work_with_versions.md). + +## Autosave While you edit a content item or product, [[= product_name =]] automatically saves your work as a new draft to help you preserve the progress in an event of a failure. To recover your work, [disable the Focus mode](../getting_started/discover_ui.md#disable-focus-mode), go to this content item's **Versions** tab, and open the most recent draft. diff --git a/docs/content_management/workflow_management/work_with_versions.md b/docs/content_management/workflow_management/work_with_versions.md index 4ee23c68..92fc6e11 100644 --- a/docs/content_management/workflow_management/work_with_versions.md +++ b/docs/content_management/workflow_management/work_with_versions.md @@ -17,7 +17,8 @@ You may need to [disable the Focus mode](../../getting_started/discover_ui.md#di ![Open drafts list](img/open_drafts.png "Open drafts list") -- by trying to edit a content item that already has open drafts. You then see a draft conflict screen, where you can pick a draft for editing, or crate a new one. +- by trying to edit a content item that already has open drafts. +You then see a [**Draft conflict**](content_versions.md#draft-conflicts) screen, where you can pick a draft for editing, or create a new one. ![Draft conflict](img/draft_conflict.png "Draft conflict") @@ -41,11 +42,11 @@ You can also do it in the **Dashboard**, the **Review queue** table, by clicking If you are not assigned to the draft, depending on the permissions set for your Role, in the **Review queue** table, you can either release the lock by clicking the **Unlock** icon, or request that the lock is released by the reviewer by clicking the **Request access** icon. ## Compare versions -You can compare two versions of the same content item. +You can compare two versions of the same content item, for example, to resolve a conflict between drafts coming from different sources. To do it, [disable the Focus mode](../../getting_started/discover_ui.md#disable-focus-mode). Then, in the content item details screen, go to the **Versions** tab and click the -**Version Compare** icon: ![Version Compare Icon](img/version_compare_icon.png){.inline-image}. +**Version Compare** icon: ![Version Compare icon](img/version_compare_icon.png){.inline-image}. From the drop-down menus at the top of the screen, select the two versions that you want to compare.