Resolving Conflicts

Two people can edit a shared board freely at the same time — different cards never interfere. A conflict only happens when the same card is changed on two machines at nearly the same moment, most often when one of them was offline and reconnects with queued edits. When that happens, the board never silently picks a winner: the change that lost lands in a conflict entry, and you decide.

The conflict tray in the Collaboration panel

Spotting a conflict

  • The Collaborate button in the top bar shows an amber badge with the number of conflicts waiting for a decision.
  • Open the Collaboration panel: a Conflicts (N) section lists each one with the card’s text (or its id) and the reason — typically version mismatch or concurrent edit.

Until you decide, your canvas shows the room’s version of the card; your own version is kept aside, byte for byte.

The three choices

ChoiceWhat happens
Keep mineYour version of the card is re-applied and sent to the room. Everyone converges on yours.
Use theirsYou accept the room’s version; your kept-aside change is dropped. Nothing changes for the others.
Keep bothYour version becomes a new card placed just beside theirs — on every machine. Available for cards (not for deletions), and handy when both edits were worth keeping.

Resolving re-syncs both machines; a resolved conflict never comes back.

Failed syncs

The same tray also shows edits that could not be sent at all — a media file over 50 MB, or a source file that went missing from your board folder. These rows offer:

  • Retry — queue the edit again (after you’ve replaced the file, for example).
  • Discard — drop the queued edit from the sync queue. Your local card keeps the change; it just won’t be sent.

Avoiding conflicts in the first place

  • Watch the “…is editing” chip: it appears on any card someone has selected. Wait, or pick a different card.
  • Agree on areas — one person on the left column, another on the right — the way you would on a whiteboard.
  • After working offline for a while, reconnect before touching cards a teammate was likely to have edited; the N changes synced while you were away notice tells you when you’re current.

Where to go next

Was this helpful?

0

Updated

Comments

Leave a Reply

Your email address will not be published. Required fields are marked *