[tw5] Is there a plugin for Import Merge Conflict Handling?

[NoxMortem]

Is there any way to import from TiddlyWiki5 A into TiddlyWiki5 B and get an interactive tool to manual merge, replace or choose to keep A or B for those tiddlers which are not identical?

I really wished I had this feature for my tiddlywikis and it looks like there was a plugin for the old tiddlywiki but I was not able to get that work with TiddlyWiki 5 (I guess the old plugin is not compatible anymore?)

[Timothy Sanders]

I've actually been mulling creating an interface for interacting with git from tw5. It would make sense, from my point of view, to deal with history and revisions for individual tiddlers via .tid files, makes a lot of sense, especially because tw5 is basically single-user.

I'm already working on some scripts to manage my file system, and sync it to a repository. One of my goals is to, when syncing fails due to .tid files needing to be merged, it will wrap the .tid files in question in another temporary .tid file, where you can merge tiddlers from within the web interface, and request a push.

I do think that relying on an external revision/conflict management system like git could be a great path forward.

One problem with merging for conflict resolution, as you requested, is what to do if the tiddlers contain more than just text. Should the. Headers be merged?

[Danielo Rodríguez]

About tiddlers revisions Noteself implements a basic revision mechanism. It does not provide merging capabilities but it is at least one neat thing. https://Noteself.github.io