Draft: feat(Conflict detection): #3591601 "Conflict resolution via API call and layout endpoint support for published entities"

Feliksas Mazeikisrequested to merge
issue/canvas-3591601:3591601-rudimentary-conflict-resolution-ui-be into 1.x

TL;DR: Modifies the ApiContentAutoSaveControllers::patch() to allow updating auto-save item conflict as resolved; Adds optional argument to the ApiLayoutController::get() that allows fetching layout of a published entity.

Edited by Feliksas Mazeikis

Merge request reports