hbons/SparkleShare — Issue #461: Conflict timestamp should not use DateTime.Now
Author: DarwinAwardWinner
Created: 2011-12-01 16:36:14+00:00
State: open

In the [ResolveConflict method at line 342](https://github.com/hbons/SparkleShare/blob/master/SparkleLib/Git/SparkleRepoGit.cs#L342), it looks like Sparkeshare resolves a conflict by appending author + timestamp to the user's own copy of the conflicted file. However, the timestamp is generated with `DateTime.Now.ToString`, which presumably gives the timestamp of the moment when the conflict is *detected*. It seems like it would make more sense to take the timestamp of the conflicting commit, or the timestamp of the file itself, if available.