[repo] pull before pushing in every situation
This commit is contained in:
parent
695dbaddbe
commit
462fd68708
|
@ -334,10 +334,8 @@ namespace SparkleLib {
|
|||
|
||||
}
|
||||
|
||||
if (_HasUnsyncedChanges) {
|
||||
CheckForRemoteChanges ();
|
||||
Push ();
|
||||
};
|
||||
if (_HasUnsyncedChanges)
|
||||
FetchRebaseAndPush ();
|
||||
|
||||
};
|
||||
|
||||
|
@ -592,6 +590,13 @@ namespace SparkleLib {
|
|||
}
|
||||
|
||||
|
||||
public void FetchRebaseAndPush ()
|
||||
{
|
||||
CheckForRemoteChanges ();
|
||||
Push ();
|
||||
}
|
||||
|
||||
|
||||
public bool AnyDifferences {
|
||||
|
||||
get {
|
||||
|
@ -849,6 +854,8 @@ namespace SparkleLib {
|
|||
if (PushingFailed != null)
|
||||
PushingFailed (this, args);
|
||||
|
||||
FetchRebaseAndPush ();
|
||||
|
||||
} else {
|
||||
|
||||
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Changes pushed.");
|
||||
|
|
Loading…
Reference in a new issue