I think a simple way to prevent conflict is letting people working on several different tiddlers, and transclude them together.
To prevent people editing same file, maybe you can use webrtc or libp2p to indicate a tiddler is currently being editing, thus prevent people from change it. Just like how Quip lock a line. -- You received this message because you are subscribed to the Google Groups "TiddlyWiki" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/tiddlywiki. To view this discussion on the web visit https://groups.google.com/d/msgid/tiddlywiki/0b02b490-2e40-4ff4-a94c-11d83b5657a9%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.

