Collaborative use of TW—possibility to merge?

[Szabolcs Horvát]

Hello everyone,

I am looking for tips on the collaborative use of TiddlyWiki. Is it suitable for editing by multiple people? Is it for example possible to use version control, and to merge tiddlers while highlighting changes?

I was able to find a few discussions on this topic, but they are all very old, and concern the old version of TiddlyWiki.

Ideally, I would like to have a way to merge two wikis, handle conflicts between tiddlers with the same title, or highlight differences between two versions.

If there are no tools to do this effectively, I would like to hear from those who tried to use TiddlyWiki collaboratively. How did you do it? Is TW suitable for such use?

Szabolcs

[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 написав:

[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 possible.

The synchronization mechanism only sends and receives the changed bits, so it is efficient and can be used from mobile devices quite comfortably. 

The flow is like this

Client a --> local DB

Client b --> local DB

local DB a <----> Server

local DB b <----> Server

local DB --> Client a

local DB --> Client b

I recommend you trying the online version: noteself.github.io

An android app is being tested by me, I plan to release a beta soon.

Regards

[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 restore them

Hope you give it a chance.

Regards

[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 (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.

[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.

[Danielo Rodríguez]

Yes, you can exclude it.

That tiddler is the current state of the wiki you are visualizing.

[LinOnetwo]

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.