ttlogmerge: A new helper script for the Unison file synchroniser #34

Merged
merged 4 commits into from Dec 20, 2013

Projects

None yet

2 participants

@pmyteh
Contributor
pmyteh commented Dec 20, 2013

A helper script for the Unison file synchroniser. One option for Unison is to use an external program to merge two files which have been change in both roots. This script uses this feature to merge two TagTime log files which have been created on different machines.

In principle, this allows you to run TagTime on multiple computers and, as long as they have the same period and random seeds, create a merged file which tracks what you were doing on all your machines.

(Inspired by https://groups.google.com/forum/#!topic/tagtime/Etey8bFaYSk)

@dreeves
Owner
dreeves commented Dec 20, 2013

See also merge.pl in the root directory here.

@dreeves dreeves merged commit 30a5037 into dreeves:master Dec 20, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment