repo git: Mark unsynced changes to upload after conflict resolution

2017-12-16 18:17:16 +01:00 · 2017-12-16 18:17:16 +01:00 · cf3b6a032e
parent c85074b573
commit cf3b6a032e
1 changed files with 2 additions and 0 deletions
--- a/Sparkles/Git/GitRepository.cs
+++ b/Sparkles/Git/GitRepository.cs
@ -611,6 +611,8 @@ namespace Sparkles.Git {
            git.StartInfo.RedirectStandardOutput = false;
            git.StartAndWaitForExit ();

+            HasUnsyncedChanges = true;
+
            if (trigger_conflict_event)
                OnConflictResolved ();
        }