[repo] get remote changes beffore pushing changes that weren't pushed due to a disconnect
This commit is contained in:
parent
a5f1d56434
commit
42f461b507
|
@ -334,8 +334,10 @@ namespace SparkleLib {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_HasUnsyncedChanges)
|
if (_HasUnsyncedChanges) {
|
||||||
|
CheckForRemoteChanges ();
|
||||||
Push ();
|
Push ();
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -847,9 +849,6 @@ namespace SparkleLib {
|
||||||
if (PushingFailed != null)
|
if (PushingFailed != null)
|
||||||
PushingFailed (this, args);
|
PushingFailed (this, args);
|
||||||
|
|
||||||
CheckForRemoteChanges ();
|
|
||||||
Push ();
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Changes pushed.");
|
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Changes pushed.");
|
||||||
|
|
Loading…
Reference in a new issue