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

repo git: push changes after conflict resolution

Browse source
This commit is contained in:
Hylke Bons 2011-05-22 16:27:06 +01:00
parent 0a1fa73196
commit 0a91597291
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -245,15 +245,14 @@ namespace SparkleLib {
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected. Trying to get out..."); SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected. Trying to get out...");
DisableWatching (); DisableWatching ();
while (AnyDifferences) while (AnyDifferences) {
ResolveConflict (); ResolveConflict ();
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict resolved."); SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict resolved.");
EnableWatching (); EnableWatching ();
OnConflictResolved (); OnConflictResolved ();
SyncUp ();
//TODO Push ();
} }
EnableWatching (); EnableWatching ();

2
SparkleLib/SparkleListenerIrc.cs
View file

@ -121,7 +121,7 @@ namespace SparkleLib {
this.client.SendMessage (SendType.Message, channel, announcement.Message); this.client.SendMessage (SendType.Message, channel, announcement.Message);
// Also announce to ourselves for debugging purposes // Also announce to ourselves for debugging purposes
OnRemoteChange (announcement); //OnRemoteChange (announcement);
} }