beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

bubbles: Less 'disturbing' message on collisions

Browse source
This commit is contained in:
Hylke Bons 2014-04-19 11:26:47 +01:00
parent 51a7ea8fae
commit da0c70e8ea
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SparkleShare/SparkleControllerBase.cs
View file

@ -446,12 +446,13 @@ namespace SparkleShare {
}; };
repo.ConflictResolved += delegate { repo.ConflictResolved += delegate {
AlertNotificationRaised ("Some files were in conflict", "Don't worry, we've kept copy of each conflicting file."); AlertNotificationRaised ("Resolved a file collision",
"Local and server versions were kept.");
}; };
this.repositories.Add (repo); this.repositories.Add (repo);
this.repositories.Sort ((x, y) => string.Compare (x.Name, y.Name)); this.repositories.Sort ((x, y) => string.Compare (x.Name, y.Name));
repo.Initialize (); repo.Initialize ();
} }