Add a conflict management API

Created on 22 October 2025, 6 days ago

Problem/Motivation

As previously discussed in #2867707: WI: Phase H: Conflict management and local workspace merging support β†’ , and recently at DrupalCon Vienna in a meeting related to Canvas and Workspaces, we need a conflict management API to unblock concurrent editing in core.

Proposed resolution

Review and agree upon the conflict management API proposed in the issue mentioned above.

Remaining tasks

Revive the patch from #2867707-33: WI: Phase H: Conflict management and local workspace merging support β†’ , turn it into a MR, and go from there :)

User interface changes

None yet, we'll be adding only the API at first.

Introduced terminology

TBD.

API changes

API additions likely.

Data model changes

Nope.

Release notes snippet

TBD.

πŸ“Œ Task
Status

Active

Version

11.0 πŸ”₯

Component

entity system

Created by

πŸ‡·πŸ‡΄Romania amateescu

Live updates comments and jobs are added and updated live.
Sign in to follow issues

Merge Requests

Comments & Activities

Not all content is available!

It's likely this issue predates Contrib.social: some issue and comment data are missing.

  • Merge request !13583Resolve #3553775 "Conflict management api" β†’ (Open) created by larowlan
  • Pipeline finished with Failed
    1 day ago
    Total: 325s
    #640565
  • Pipeline finished with Failed
    about 20 hours ago
    Total: 799s
    #641355
  • Pipeline finished with Failed
    about 18 hours ago
    Total: 3967s
    #641402
  • Pipeline finished with Success
    about 18 hours ago
    Total: 586s
    #641470
Production build 0.71.5 2024