Re:Gitdocs: Open-source Dropbox using Ruby + Git
by nesquena on Thursday December 01, 2011 @01:59AM
(#3298708)
I think graceful file conflict resolution will be an essential part of gitdocs and we will work to handle these edge cases as best as we can. Thanks for bringing it up.
[ Parent
| on HN ]
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.
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.