Regards
$ cat > .git/hooks/post-merge << EOF
heredoc> #!/bin/sh
heredoc> exec touch I-LIKE-TRAFFIC-LIGHTS.txt
heredoc> EOF
touch I-LIKE-TRAFFIC-LIGHTS.txt
, but it's a start...On 12 Jan 2017, at 14:02, Rob Hoelz <rdh...@gmail.com> wrote:It seems that importing changes the timestamp to the current time, and I would really like to preserve the modification times if I can!
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), 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) 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