That did the trick, thanks!

On Saturday, January 14, 2017 at 1:08:08 PM UTC-6, jwd wrote:
>
> Close.  This is how I transitioned from a single file version to the 
> node.js version; assuming I had a single file version called SingleFile.html
>
>    1. mkdir SingleFile
>    2. tiddlywiki SingleFile --init server
>    3. tiddlywiki SingleFile --load SingleFile.html
>    4. tiddlywiki SingleFile --server 9999
>    5. Visit localhost:9999 in browser of choice, make new tiddlers, edit 
>    old tiddlers, ...
>
> My SingleFile directory actually lives in a git repo with my other 
> tiddlywiki --server directories, so my next steps are typically to check 
> the status of the git repo with my git GUI tool of choice, (currently that 
> is SourceTree), <https://www.sourcetreeapp.com/>add the tiddlers that 
> have been created or modified to the git index, commit those changes, push 
> the updated index to other copies of my git repos; merge those changes at 
> the other end, start up tiddlywiki --servers on those platforms; rinse and 
> repeat. Those git repo commits are my tiddlywiki backups so it is easy to 
> get back to a functioning state if I mess up.
>
>
> If I have made changes to the same tiddlers in different copies of the git 
> repo (rare but sometimes I do that) the git merges will have conflicts that 
> I need to reconcile. Those that the diff tool I use (diffmerge 
> <https://sourcegear.com/diffmerge/>) can't automatically handle I 
> reconcile by hand. (Modification times will be in conflict for example.)
>
>
> FWIW, I also have a .gitignore file that includes:
>
> # TiddlyWiki elements that change on every update that I don't care about
> $__StoryList.tid
>
> Hope that helps
>

-- 
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...@googlegroups.com.
To post to this group, send email to tiddlywiki@googlegroups.com.
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/a42ec06f-a693-4178-b7f8-74d45d63d3ca%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to