private RepoFile ResolveConflicts(RepoFile changedRemoteFile)
{
ILocalSyncTable localSyncTable = new LocalSyncTable(".");
ILocalFileSystem localFileSystem = new LocalFileSystem();
IConflictMediator conflictMediator = new ConflictMediator();
var fromLocalSyncTable = localSyncTable.GetTimeStamp(changedRemoteFile);
var fromLocalFileSystem = localFileSystem.GetTimeStamp(changedRemoteFile);
conflictMediator.DetectUpdateConflct(fromLocalSyncTable, fromLocalFileSystem, changedRemoteFile,
_ => { }, localFile => {
localFileSystem.Rename(localFile);
_ui.LogConflict(localFile);
});
return changedRemoteFile;
}
