From 7fecc471b02d430d33d994b599bbc04d13222fd2 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 24 Nov 2020 17:55:44 +0800
Subject: [PATCH] feature<Dashboard>: auto delete .git/rebase-apply when
 there's no conflicts detected

---
 src/UI/Dashboard.xaml.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/UI/Dashboard.xaml.cs b/src/UI/Dashboard.xaml.cs
index f4d6a048..2b99798f 100644
--- a/src/UI/Dashboard.xaml.cs
+++ b/src/UI/Dashboard.xaml.cs
@@ -398,6 +398,9 @@ namespace SourceGit.UI {
                 commits.LoadMergeMessage();
             } else {
                 abortPanel.Visibility = Visibility.Collapsed;
+
+                var rebaseApply = Path.Combine(repo.GitDir, "rebase-apply");
+                if (Directory.Exists(rebaseApply)) Directory.Delete(rebaseApply);
             }
         }