July 14, 2002

I just committed code that allows manual recording conflict resolution. All that's left for conflict resolution would then be dealing with cases where the user doesn't resolve the conflicts..

Posted by Isaac on July 14th 2002