BlocksApp shell and pages

Edit Conflict, Pro

What to show when a save fails because someone else changed the record. Each changed field shows as yours, theirs and merged; changes only one side made merge on their own, and the rest are picked from the keyboard.

A three-way merge for a save refused because someone else changed the record first.

Changed Twice

Your version, theirs and the merged result for every changed field, with the plan and the notes waiting for a pick.

Pro

Editing the customer Acme Corporation

Riley Chen changed this customer while you were editing

2 minutes ago · Version 7

2 fields need a pick. 4 changes were merged for you.

PlanBoth changedWas: Growth
Merged, Pick yours or theirs
NotesBoth changed
Merged, Pick yours or theirs
Billing emailOnly they changed thisWas: ap@acme.example
Merged, billing@acme.example
SeatsYou both made this changeWas: 25
Yours, 40
Theirs, 40
Merged, 40
Renews onOnly you changed thisWas: Mar 31, 2027
Merged, Apr 30, 2027
TagsBoth changed; additions and removals combined
Yours, emea+expansion−trial
Theirs, trialemea+priority
Merged, emea+expansion+priority−trial

2 fields unchanged

Deleted Meanwhile

Your changes to a customer someone deleted, with a way to restore it with them.

Pro

Editing the customer Acme Corporation

Riley Chen deleted this customer

5 minutes ago

Your 5 changes weren’t saved. Restore the customer with them, or discard them.

Plan
ScaleWas: Growth
Seats
40Was: 25
Renews on
Apr 30, 2027Was: Mar 31, 2027
Tags
emea+expansion−trial
Notes
Renewal call booked for March. They want SSO before they add the support team. added Priya asked for a quote for 40 seats on Scale.

On this page