News for hackers. Stuff that matters.

A comment on Gitdocs: Open-source Dropbox using Ruby + Git. Parent comment

Re:Gitdocs: Open-source Dropbox using Ruby + Git by hbons on Thursday December 01, 2011 @09:10AM (#3299752)
You might want to look at this bit: https://github.com/hbons/SparkleShare/blob/master/SparkleLib...

It tries to copy the Dropbox conflict behaviour.

[ Parent | on HN ]
Re:Gitdocs: Open-source Dropbox using Ruby + Git by rcthompson on Thursday December 01, 2011 @11:27AM (#3300252)
Interesting. I'll have to try it out again.

Although, if I'm reading this correctly, the logic isn't quite right. It uses the timestamp of the time when the conflict is detected, when it should really use the conflicted file's last-modified time, or maybe the timestamp of the conflicting commit.

[ Parent | on HN ]