these will only occur when syncing Offline pages. All other “merge conflicts” will be handled in a squishy and human way, rather than an automatic computery way.

Different “branches” won’t be merged automatically, like with code. When you Branch new pages from current page you’re actually just forking a project.

Basically with WeWrite everything is on the main branch.

With words, conflicts aren’t very serious, and “merging” conflicting ideas is actually just the process of synthesis of new ideas. see Group split

Conflict-free Replicated Data Type (CRDT)

sometimes Obsidian fucks up text, duplicating chunks of text, corrupting text. possibly due to sync errors