Magically taking care of conflicts is going to be the big sticking point. We may be able to do something like you are describing that lets you see the conflicts and handle them manually with a reasonable interface, but that is a very significant project by itself.
-- You received this message because you are subscribed to the Google Groups "TiddlyWikiDev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tiddlywikidev/869e3087-052d-47a2-bc11-60ab73d02aa8o%40googlegroups.com.
