neos-ui icon indicating copy to clipboard operation
neos-ui copied to clipboard

Published 20 hours ago • verified publisher icon neos

EPIC: Neos 9.0 Conflict Resolution

Open grebaldi opened this issue 1 year ago • 0 comments

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: https://github.com/neos/neos-development-collection/issues/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

  • [x] #3743
  • [x] #3744
  • [x] #3761

Related

  • https://github.com/neos/neos-development-collection/pull/4939
  • https://github.com/neos/neos-development-collection/pull/4943
  • https://github.com/neos/neos-ui/pull/3752
  • https://github.com/neos/neos-development-collection/pull/4965

grebaldi avatar Mar 13 '24 09:03 grebaldi