[tw] Re: Collaborative use of TW—possibility to merge?

2017-01-24 Thread Danielo Rodríguez
Yes, you can exclude it. That tiddler is the current state of the wiki you are visualizing. -- 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 tiddlywiki+unsubscr...

[tw] Re: Collaborative use of TW—possibility to merge?

2017-01-24 Thread Szabolcs Horvát
Is it safe to exclude $__StoryList.tid from version control? It seems that this file will always get modified and will often cause merge conflicts. This is a problem when several people on the project are new to version control. -- You received this message because you are subscribed to the

[tw] Re: Collaborative use of TW—possibility to merge?

2017-01-23 Thread Szabolcs Horvát
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 (mer

[tw] Re: Collaborative use of TW—possibility to merge?

2017-01-23 Thread Danielo Rodríguez
I forgot to mention that it has revision control, but with the following limitations: - Only the local changes are tracked. Changes that other users made are only available on the server - You can explore the different revisions with a friendly UI, but there is no friendly UI to re

[tw] Re: Collaborative use of TW—possibility to merge?

2017-01-23 Thread Danielo Rodríguez
Take a look at NoteSelf (noteself.github.io) It has a different approach than regular tiddlywikis: it uses a local DB as which is synced a remote DB where all the client wikis are synced too. While it does not have specific facilities to manage several users, a multi user scenario is indeed pos

[tw] Re: Collaborative use of TW—possibility to merge?

2017-01-23 Thread oleghbond
Dear Szabolcs, A powerful, robust and versatile approach is in combination TW5 + Node.js + Git + Github + Github Pages. Detailed instruction could be found at https://github.com/danielo515/TW5-auto-publish2gh-pages/. Olegh понеділок, 23 січня 2017 р. 12:48:59 UTC+2 користувач Szabolcs Horvát