repo git: Mark unsynced changes to upload after conflict resolution
This commit is contained in:
parent
c85074b573
commit
cf3b6a032e
|
@ -611,6 +611,8 @@ namespace Sparkles.Git {
|
|||
git.StartInfo.RedirectStandardOutput = false;
|
||||
git.StartAndWaitForExit ();
|
||||
|
||||
HasUnsyncedChanges = true;
|
||||
|
||||
if (trigger_conflict_event)
|
||||
OnConflictResolved ();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue