Merged Edit

Edits from multiple devices are merged

• When the same note is edited on two devices before they sync, the changes from both are combined in the note

• Changes made to different sections of a note are merged automatically with no user intervention needed

• Where both devices changed the same lines, the note shows each version in a "conflict" callout;
  • keep the one you want and delete the other

• Both versions a merged note was made from are kept in Note Versions, so you can copy from either one

• When any other file is edited on two devices before they sync,
  • the later edit wins and the other version is kept beside it as "[Conflict] name (who, when).ext",
  • so no work is lost

• A file renamed on one device while its contents were edited on another is kept under both names, with the contents each device had

• Conflict callouts and conflict copies name the person who made each version