feature<Dashboard>: auto delete .git/rebase-apply when there's no conflicts detected

This commit is contained in:
leo 2020-11-24 17:55:44 +08:00
parent cbdebee4c2
commit 7fecc471b0

View file

@ -398,6 +398,9 @@ namespace SourceGit.UI {
commits.LoadMergeMessage(); commits.LoadMergeMessage();
} else { } else {
abortPanel.Visibility = Visibility.Collapsed; abortPanel.Visibility = Visibility.Collapsed;
var rebaseApply = Path.Combine(repo.GitDir, "rebase-apply");
if (Directory.Exists(rebaseApply)) Directory.Delete(rebaseApply);
} }
} }