4 ms·

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 bringin

• hbons 15y ago
  You might want to look at this bit: https://github.com/hbons/SparkleShare/blob/master/SparkleLib/Git/SparkleRepoGit.cs#L293 https://github.com/hbons/SparkleShare/blob/master/SparkleLib... It tries to copy the Dropbox conflict behaviour.
  • rcthompson 15y ago
    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.