Thank you for the tips Danielo and Olegh! I neglected to mention that I do not want to make this wiki public and I wasn't originally thinking to put it online. I am just looking for a collaborative note taking system.
It seems that just using the node.js version solves the biggest problem (merging) by storing each tiddler in a separate file. Then changes to tiddlers are clearly separated, and I can track who changed what. I am still looking at NoteSelf, and trying to understand if it is appropriate for this use case. It seems to be a very interesting system that I am going to try out regardless of whether it is suitable for this project. -- 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/744d6605-4e84-404d-9d6a-fac9aa1fccf1%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
