Skip to content

Commit

Permalink
Add informarion about where conflicts originate from
Browse files Browse the repository at this point in the history
  • Loading branch information
dabrt committed Jun 11, 2024
1 parent ab5ac87 commit 97b6885
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
11 changes: 8 additions & 3 deletions docs/content_management/content_versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -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}.

Check warning on line 49 in docs/content_management/workflow_management/work_with_versions.md

View workflow job for this annotation

GitHub Actions / vale

[vale] docs/content_management/workflow_management/work_with_versions.md#L49

[Ibexa.DontCapitalize] Don't capitalize 'Version' if inside the sentence.
Raw output
{"message": "[Ibexa.DontCapitalize] Don't capitalize 'Version' if inside the sentence.", "location": {"path": "docs/content_management/workflow_management/work_with_versions.md", "range": {"start": {"line": 49, "column": 3}}}, "severity": "WARNING"}

From the drop-down menus at the top of the screen, select the two versions that you want to compare.

Expand Down

0 comments on commit 97b6885

Please sign in to comment.