repo git: push changes after conflict resolution
This commit is contained in:
parent
0a1fa73196
commit
0a91597291
|
@ -245,15 +245,14 @@ namespace SparkleLib {
|
|||
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected. Trying to get out...");
|
||||
DisableWatching ();
|
||||
|
||||
while (AnyDifferences)
|
||||
while (AnyDifferences) {
|
||||
ResolveConflict ();
|
||||
|
||||
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict resolved.");
|
||||
EnableWatching ();
|
||||
|
||||
OnConflictResolved ();
|
||||
|
||||
//TODO Push ();
|
||||
SyncUp ();
|
||||
}
|
||||
|
||||
EnableWatching ();
|
||||
|
|
|
@ -121,7 +121,7 @@ namespace SparkleLib {
|
|||
this.client.SendMessage (SendType.Message, channel, announcement.Message);
|
||||
|
||||
// Also announce to ourselves for debugging purposes
|
||||
OnRemoteChange (announcement);
|
||||
//OnRemoteChange (announcement);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue