Add conflict detection and resolution UI for selective publishing

Ravi Maniyarrequested to merge
issue/canvas-3585970:3585970-add-rudimentary-conflict into 1.x

Closes #3585970

Manual Testing Steps - Conflict Detection & Resolution UI

Test Steps

  1. Open a Canvas page editor.
  2. Make a pending change.
  3. Create a real conflict by updating the same page elsewhere.
  4. Return to the original editor and make another change.
  5. Verify the save request returns 409 Conflict.
  6. Click Review X changes.
  7. Verify the current page row shows a red warning icon/text and disabled checkbox.
  8. Open the row dropdown and verify Resolve conflict is shown and View changes is hidden.
  9. Compare the banner, row styling, dropdown, and spacing with the Figma design.

Expected Results

  • Conflict UI appears only for a real conflict.
  • Conflicted row cannot be selected for publishing.
  • Other pending rows remain normal.
  • UI matches the Figma reference.
Edited by Ravi Maniyar

Merge request reports