EPIC: Neos 9.0 Conflict Resolution

[grebaldi]

In the new Content Repository, editors may run into conflicts when publishing their workspaces. Currently, the UI offers no way to get out of such a situation.

The (long-term) idea is to offer editors multiple strategies to resolve conflicts if possible. These need to be implemented first on CR-level (see: neos/neos-development-collection#4866) and then properly reflected in the UI.

This issue means to collect all issues related to bringing rudimentary conflict resolution functionality to the UI.

TODOs

• FEATURE: Lock the UI and present a modal during publish/discard #3743
• FEATURE: Offer resolution strategies when conflicts arise during rebase #3744
• FEATURE: Offer rebase option when publish/discard fails due to conflict #3761

Related

• TASK: Add force strategy to the rebase workspace command neos-development-collection#4939
• FEATURE: Highlevel Workspace API neos-development-collection#4943
• FEATURE: Refactor publication and discarding endpoints #3752
• TASK: Introduce rebase failed exception and deprecate WorkspaceRebaseFailed neos-development-collection#4965