refactor: rewrite the way to deal with uncommitted local changes when checkout/pull/create branch (#1085)

Signed-off-by: leo <longshuang@msn.cn>

src/Models/DealWithLocalChanges.cs

@@ -1,9 +0,0 @@
-namespace SourceGit.Models
-{
-    public enum DealWithLocalChanges
-    {
-        DoNothing,
-        StashAndReaply,
-        Discard,
-    }
-}

src/Resources/Locales/de_DE.axaml

@@ -90,7 +90,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Lokale Änderungen:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Verwerfen</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Nichts tun</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stashen &amp; wieder anwenden</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry Pick</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Quelle an Commit-Nachricht anhängen</x:String>
@@ -206,7 +205,6 @@
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Erstellten Branch auschecken</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Lokale Änderungen:</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Verwerfen</x:String>
-  <x:String x:Key="Text.CreateBranch.LocalChanges.DoNothing" xml:space="preserve">Nichts tun</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Stashen &amp; wieder anwenden</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Neuer Branch-Name:</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Branch-Namen eingeben.</x:String>
@@ -517,7 +515,6 @@
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">Lokaler Branch:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Lokale Änderungen:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Verwerfen</x:String>
-  <x:String x:Key="Text.Pull.LocalChanges.DoNothing" xml:space="preserve">Nichts tun</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Stashen &amp; wieder anwenden</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Ohne Tags fetchen</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remote:</x:String>

src/Resources/Locales/en_US.axaml

@@ -88,7 +88,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Local Changes:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Discard</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Do Nothing</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reapply</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry Pick</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Append source to commit message</x:String>
@@ -205,7 +204,6 @@
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Check out the created branch</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Local Changes:</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Discard</x:String>
-  <x:String x:Key="Text.CreateBranch.LocalChanges.DoNothing" xml:space="preserve">Do Nothing</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reapply</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">New Branch Name:</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Enter branch name.</x:String>
@@ -520,7 +518,6 @@
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">Into:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Local Changes:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Discard</x:String>
-  <x:String x:Key="Text.Pull.LocalChanges.DoNothing" xml:space="preserve">Do Nothing</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reapply</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Fetch without tags</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remote:</x:String>

src/Resources/Locales/es_ES.axaml

@@ -91,7 +91,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Rama:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Cambios Locales:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">No Hacer Nada</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry Pick</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Añadir fuente al mensaje de commit</x:String>
@@ -208,7 +207,6 @@
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checkout de la rama creada</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Cambios Locales:</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
-  <x:String x:Key="Text.CreateBranch.LocalChanges.DoNothing" xml:space="preserve">No Hacer Nada</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Nombre de la Nueva Rama:</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Introduzca el nombre de la rama.</x:String>
@@ -524,7 +522,6 @@
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">En:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Cambios Locales:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
-  <x:String x:Key="Text.Pull.LocalChanges.DoNothing" xml:space="preserve">No Hacer Nada</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Fetch sin etiquetas</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remoto:</x:String>

src/Resources/Locales/fr_FR.axaml

@@ -83,7 +83,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branche :</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Changements locaux :</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Annuler</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Ne rien faire</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Mettre en stash et réappliquer</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry-Pick de ce commit</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Ajouter la source au message de commit</x:String>
@@ -198,7 +197,6 @@
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Récupérer la branche créée</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Changements locaux :</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Rejeter</x:String>
-  <x:String x:Key="Text.CreateBranch.LocalChanges.DoNothing" xml:space="preserve">Ne rien faire</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Réappliquer</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Nom de la nouvelle branche :</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Entrez le nom de la branche.</x:String>
@@ -492,7 +490,6 @@
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">Dans :</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Changements locaux :</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Rejeter</x:String>
-  <x:String x:Key="Text.Pull.LocalChanges.DoNothing" xml:space="preserve">Ne rien faire</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Réappliquer</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Fetch sans les tags</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Dépôt distant :</x:String>

src/Resources/Locales/it_IT.axaml

@@ -91,7 +91,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Modifiche Locali:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Scarta</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Non fare nulla</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stasha e Ripristina</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry Pick</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Aggiungi sorgente al messaggio di commit</x:String>
@@ -208,7 +207,6 @@
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checkout del Branch Creato</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Modifiche Locali:</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Scarta</x:String>
-  <x:String x:Key="Text.CreateBranch.LocalChanges.DoNothing" xml:space="preserve">Non Fare Nulla</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Stasha e Ripristina</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Nome Nuovo Branch:</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Inserisci il nome del branch.</x:String>
@@ -523,7 +521,6 @@
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">In:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Modifiche Locali:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Scarta</x:String>
-  <x:String x:Key="Text.Pull.LocalChanges.DoNothing" xml:space="preserve">Non fare nulla</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Stasha e Riapplica</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Recupera senza tag</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remoto:</x:String>

src/Resources/Locales/pt_BR.axaml

@@ -107,7 +107,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Alterações Locais:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Nada</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry-Pick</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Adicionar origem à mensagem de commit</x:String>
@@ -215,7 +214,6 @@
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checar o branch criado</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Alterações Locais:</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
-  <x:String x:Key="Text.CreateBranch.LocalChanges.DoNothing" xml:space="preserve">Não Fazer Nada</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Guardar &amp; Reaplicar</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Nome do Novo Branch:</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Insira o nome do branch.</x:String>
@@ -506,7 +504,6 @@
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">Para:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Alterações Locais:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
-  <x:String x:Key="Text.Pull.LocalChanges.DoNothing" xml:space="preserve">Não Fazer Nada</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Guardar &amp; Reaplicar</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Buscar sem tags</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remoto:</x:String>

src/Resources/Locales/ru_RU.axaml

@@ -91,7 +91,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Ветка:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Локальные изменения:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Отклонить</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Ничего не делать</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Отложить и примненить повторно</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve"> Частичный выбор</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Добавить источник для ревизии сообщения</x:String>
@@ -209,7 +208,6 @@
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Проверить созданную ветку</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Локальные изменения:</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Отклонить</x:String>
-  <x:String x:Key="Text.CreateBranch.LocalChanges.DoNothing" xml:space="preserve">Ничего не делать</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">Отложить и применить повторно</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Имя новой ветки:</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Введите имя ветки.</x:String>
@@ -524,7 +522,6 @@
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">В:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Локальные изменения:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Отклонить</x:String>
-  <x:String x:Key="Text.Pull.LocalChanges.DoNothing" xml:space="preserve">Ничего не делать</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Отложить и применить повторно</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Забрать без меток</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Внешний репозиторий:</x:String>

src/Resources/Locales/zh_CN.axaml

@@ -91,7 +91,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">目标分支 ：</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">未提交更改 ：</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">丢弃更改</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">不做处理</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">贮藏并自动恢复</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">挑选提交</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">提交信息中追加来源信息</x:String>
@@ -208,7 +207,6 @@
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">完成后切换到新分支</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">未提交更改 ：</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">丢弃更改</x:String>
-  <x:String x:Key="Text.CreateBranch.LocalChanges.DoNothing" xml:space="preserve">不做处理</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">贮藏并自动恢复</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">新分支名 ：</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">填写分支名称。</x:String>
@@ -524,7 +522,6 @@
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">本地分支 ：</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">未提交更改 ：</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">丢弃更改</x:String>
-  <x:String x:Key="Text.Pull.LocalChanges.DoNothing" xml:space="preserve">不做处理</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">贮藏并自动恢复</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">不拉取远程标签</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">远程 ：</x:String>

src/Resources/Locales/zh_TW.axaml

@@ -91,7 +91,6 @@
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">目標分支:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">未提交變更:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">捨棄變更</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">不做處理</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">擱置變更並自動復原</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">揀選提交</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">提交資訊中追加來源資訊</x:String>
@@ -208,7 +207,6 @@
   <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">完成後切換到新分支</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">未提交變更:</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">捨棄變更</x:String>
-  <x:String x:Key="Text.CreateBranch.LocalChanges.DoNothing" xml:space="preserve">不做處理</x:String>
   <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">擱置變更並自動復原</x:String>
   <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">新分支名稱:</x:String>
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">輸入分支名稱。</x:String>
@@ -523,7 +521,6 @@
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">本機分支:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">未提交變更:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">捨棄變更</x:String>
-  <x:String x:Key="Text.Pull.LocalChanges.DoNothing" xml:space="preserve">不做處理</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">擱置變更並自動復原</x:String>
   <x:String x:Key="Text.Pull.NoTags" xml:space="preserve">不拉取遠端標籤</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">遠端:</x:String>

src/ViewModels/Checkout.cs

@@ -9,16 +9,17 @@ namespace SourceGit.ViewModels
             get;
         }
 
-        public Models.DealWithLocalChanges PreAction
+        public bool DiscardLocalChanges
         {
             get;
             set;
-        } = Models.DealWithLocalChanges.DoNothing;
+        }
 
         public Checkout(Repository repo, string branch)
         {
             _repo = repo;
             Branch = branch;
+            DiscardLocalChanges = false;
             View = new Views.Checkout() { DataContext = this };
         }
 
@@ -33,7 +34,12 @@ namespace SourceGit.ViewModels
                 var needPopStash = false;
                 if (changes > 0)
                 {
-                    if (PreAction == Models.DealWithLocalChanges.StashAndReaply)
+                    if (DiscardLocalChanges)
+                    {
+                        SetProgressDescription("Discard local changes ...");
+                        Commands.Discard.All(_repo.FullPath, false);
+                    }
+                    else
                     {
                         SetProgressDescription("Stash local changes ...");
                         var succ = new Commands.Stash(_repo.FullPath).Push("CHECKOUT_AUTO_STASH");
@@ -45,11 +51,6 @@ namespace SourceGit.ViewModels
 
                         needPopStash = true;
                     }
-                    else if (PreAction == Models.DealWithLocalChanges.Discard)
-                    {
-                        SetProgressDescription("Discard local changes ...");
-                        Commands.Discard.All(_repo.FullPath, false);
-                    }
                 }
 
                 SetProgressDescription("Checkout branch ...");

src/ViewModels/CheckoutCommit.cs

@@ -9,16 +9,17 @@ namespace SourceGit.ViewModels
             get;
         }
 
-        public bool AutoStash
+        public bool DiscardLocalChanges
         {
-            get => _autoStash;
+            get;
-            set => SetProperty(ref _autoStash, value);
+            set;
         }
 
         public CheckoutCommit(Repository repo, Models.Commit commit)
         {
             _repo = repo;
             Commit = commit;
+            DiscardLocalChanges = false;
             View = new Views.CheckoutCommit() { DataContext = this };
         }
 
@@ -33,7 +34,12 @@ namespace SourceGit.ViewModels
                 var needPopStash = false;
                 if (changes > 0)
                 {
-                    if (AutoStash)
+                    if (DiscardLocalChanges)
+                    {
+                        SetProgressDescription("Discard local changes ...");
+                        Commands.Discard.All(_repo.FullPath, false);
+                    }
+                    else
                     {
                         SetProgressDescription("Stash local changes ...");
                         var succ = new Commands.Stash(_repo.FullPath).Push("CHECKOUT_AUTO_STASH");
@@ -45,11 +51,6 @@ namespace SourceGit.ViewModels
 
                         needPopStash = true;
                     }
-                    else
-                    {
-                        SetProgressDescription("Discard local changes ...");
-                        Commands.Discard.All(_repo.FullPath, false);
-                    }
                 }
 
                 SetProgressDescription("Checkout commit ...");
@@ -67,6 +68,5 @@ namespace SourceGit.ViewModels
         }
 
         private readonly Repository _repo = null;
-        private bool _autoStash = true;
     }
 }

src/ViewModels/CreateBranch.cs

@@ -19,11 +19,11 @@ namespace SourceGit.ViewModels
             get;
         }
 
-        public Models.DealWithLocalChanges PreAction
+        public bool DiscardLocalChanges
         {
             get;
             set;
-        } = Models.DealWithLocalChanges.DoNothing;
+        }
 
         public bool CheckoutAfterCreated
         {
@@ -47,6 +47,7 @@ namespace SourceGit.ViewModels
             }
 
             BasedOn = branch;
+            DiscardLocalChanges = false;
             View = new Views.CreateBranch() { DataContext = this };
         }
 
@@ -56,6 +57,7 @@ namespace SourceGit.ViewModels
             _baseOnRevision = commit.SHA;
 
             BasedOn = commit;
+            DiscardLocalChanges = false;
             View = new Views.CreateBranch() { DataContext = this };
         }
 
@@ -65,6 +67,7 @@ namespace SourceGit.ViewModels
             _baseOnRevision = tag.SHA;
 
             BasedOn = tag;
+            DiscardLocalChanges = false;
             View = new Views.CreateBranch() { DataContext = this };
         }
 
@@ -98,7 +101,12 @@ namespace SourceGit.ViewModels
                     var needPopStash = false;
                     if (changes > 0)
                     {
-                        if (PreAction == Models.DealWithLocalChanges.StashAndReaply)
+                        if (DiscardLocalChanges)
+                        {
+                            SetProgressDescription("Discard local changes...");
+                            Commands.Discard.All(_repo.FullPath, false);
+                        }
+                        else
                         {
                             SetProgressDescription("Stash local changes");
                             succ = new Commands.Stash(_repo.FullPath).Push("CREATE_BRANCH_AUTO_STASH");
@@ -110,11 +118,6 @@ namespace SourceGit.ViewModels
 
                             needPopStash = true;
                         }
-                        else if (PreAction == Models.DealWithLocalChanges.Discard)
-                        {
-                            SetProgressDescription("Discard local changes...");
-                            Commands.Discard.All(_repo.FullPath, false);
-                        }
                     }
 
                     SetProgressDescription($"Create new branch '{fixedName}'");

src/ViewModels/Pull.cs

@@ -38,11 +38,11 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _selectedBranch, value, true);
         }
 
-        public Models.DealWithLocalChanges PreAction
+        public bool DiscardLocalChanges
         {
             get;
             set;
-        } = Models.DealWithLocalChanges.DoNothing;
+        }
 
         public bool UseRebase
         {
@@ -124,7 +124,12 @@ namespace SourceGit.ViewModels
                 var needPopStash = false;
                 if (changes > 0)
                 {
-                    if (PreAction == Models.DealWithLocalChanges.StashAndReaply)
+                    if (DiscardLocalChanges)
+                    {
+                        SetProgressDescription("Discard local changes ...");
+                        Commands.Discard.All(_repo.FullPath, false);
+                    }
+                    else
                     {
                         SetProgressDescription("Stash local changes...");
                         var succ = new Commands.Stash(_repo.FullPath).Push("PULL_AUTO_STASH");
@@ -136,11 +141,6 @@ namespace SourceGit.ViewModels
 
                         needPopStash = true;
                     }
-                    else if (PreAction == Models.DealWithLocalChanges.Discard)
-                    {
-                        SetProgressDescription("Discard local changes ...");
-                        Commands.Discard.All(_repo.FullPath, false);
-                    }
                 }
 
                 bool rs;

src/Views/Checkout.axaml

@@ -18,7 +18,7 @@
         <RowDefinition Height="32"/>
         <RowDefinition Height="Auto" MinHeight="32"/>
       </Grid.RowDefinitions>
-      
+
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -32,21 +32,13 @@
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.Checkout.LocalChanges}"/>
-      <WrapPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">        
+      <WrapPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-        <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.DoNothing}"
+        <RadioButton GroupName="LocalChanges"
-                     x:Name="RadioDoNothing"
-                     GroupName="LocalChanges"
                      Margin="0,0,8,0"
-                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
+                     Content="{DynamicResource Text.CreateBranch.LocalChanges.StashAndReply}"
-        <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.StashAndReply}"
+                     IsChecked="{Binding !DiscardLocalChanges, Mode=TwoWay}"/>
-                     x:Name="RadioStashAndReply"
+        <RadioButton GroupName="LocalChanges"
-                     GroupName="LocalChanges"
+                     Content="{DynamicResource Text.CreateBranch.LocalChanges.Discard}"/>
-                     Margin="0,0,8,0"
-                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
-        <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.Discard}"
-                     x:Name="RadioDiscard"
-                     GroupName="LocalChanges"
-                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
       </WrapPanel>
     </Grid>
   </StackPanel>

src/Views/Checkout.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
@@ -9,51 +8,5 @@ namespace SourceGit.Views
         {
             InitializeComponent();
         }
-
-        protected override void OnLoaded(RoutedEventArgs e)
-        {
-            base.OnLoaded(e);
-
-            var vm = DataContext as ViewModels.Checkout;
-            if (vm == null)
-                return;
-
-            switch (vm.PreAction)
-            {
-                case Models.DealWithLocalChanges.DoNothing:
-                    RadioDoNothing.IsChecked = true;
-                    break;
-                case Models.DealWithLocalChanges.StashAndReaply:
-                    RadioStashAndReply.IsChecked = true;
-                    break;
-                default:
-                    RadioDiscard.IsChecked = true;
-                    break;
-            }
-        }
-
-        private void OnLocalChangeActionIsCheckedChanged(object sender, RoutedEventArgs e)
-        {
-            var vm = DataContext as ViewModels.Checkout;
-            if (vm == null)
-                return;
-
-            if (RadioDoNothing.IsChecked == true)
-            {
-                if (vm.PreAction != Models.DealWithLocalChanges.DoNothing)
-                    vm.PreAction = Models.DealWithLocalChanges.DoNothing;
-                return;
-            }
-
-            if (RadioStashAndReply.IsChecked == true)
-            {
-                if (vm.PreAction != Models.DealWithLocalChanges.StashAndReaply)
-                    vm.PreAction = Models.DealWithLocalChanges.StashAndReaply;
-                return;
-            }
-
-            if (vm.PreAction != Models.DealWithLocalChanges.Discard)
-                vm.PreAction = Models.DealWithLocalChanges.Discard;
-        }
     }
 }

src/Views/CheckoutCommit.axaml

@@ -30,16 +30,16 @@
       <StackPanel Grid.Row="1" Grid.Column="1" Height="32" Orientation="Horizontal">
         <RadioButton Content="{DynamicResource Text.Checkout.LocalChanges.StashAndReply}"
                      GroupName="LocalChanges"
-                     IsChecked="{Binding AutoStash, Mode=TwoWay}" />
+                     Margin="0,0,8,0"
+                     IsChecked="{Binding !DiscardLocalChanges, Mode=TwoWay}"/>
         <RadioButton Content="{DynamicResource Text.Checkout.LocalChanges.Discard}"
-                     GroupName="LocalChanges"
+                     GroupName="LocalChanges"/>
-                     Margin="8,0,0,0" />
       </StackPanel>
 
       <Grid Grid.Row="2" Grid.Column="1" ColumnDefinitions="Auto,*" Margin="0,6,0,0">
-        <Path Grid.Column="0" 
+        <Path Grid.Column="0"
-              Width="14" Height="14" 
+              Width="14" Height="14"
-              Data="{StaticResource Icons.Error}" 
+              Data="{StaticResource Icons.Error}"
               Fill="DarkOrange"/>
         <TextBlock Grid.Column="1" Margin="8,0,0,0"
                    Text="{DynamicResource Text.Checkout.Commit.Warning}"

src/Views/CreateBranch.axaml

@@ -70,20 +70,12 @@
                  IsVisible="{Binding !IsBareRepository}"/>
       <Border Grid.Row="3" Grid.Column="1" MinHeight="32" IsVisible="{Binding !IsBareRepository}">
         <WrapPanel Orientation="Horizontal" VerticalAlignment="Center">
-          <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.DoNothing}"
+          <RadioButton GroupName="LocalChanges"
-                       x:Name="RadioDoNothing"
-                       GroupName="LocalChanges"
                        Margin="0,0,8,0"
-                       IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
+                       Content="{DynamicResource Text.CreateBranch.LocalChanges.StashAndReply}"
-          <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.StashAndReply}"
+                       IsChecked="{Binding !DiscardLocalChanges, Mode=TwoWay}"/>
-                       x:Name="RadioStashAndReply"
+          <RadioButton GroupName="LocalChanges"
-                       GroupName="LocalChanges"
+                       Content="{DynamicResource Text.CreateBranch.LocalChanges.Discard}"/>
-                       Margin="0,0,8,0"
-                       IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
-          <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.Discard}"
-                       x:Name="RadioDiscard"
-                       GroupName="LocalChanges"
-                       IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
         </WrapPanel>
       </Border>
 

src/Views/CreateBranch.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
@@ -9,51 +8,5 @@ namespace SourceGit.Views
         {
             InitializeComponent();
         }
-
-        protected override void OnLoaded(RoutedEventArgs e)
-        {
-            base.OnLoaded(e);
-
-            var vm = DataContext as ViewModels.CreateBranch;
-            if (vm == null)
-                return;
-
-            switch (vm.PreAction)
-            {
-                case Models.DealWithLocalChanges.DoNothing:
-                    RadioDoNothing.IsChecked = true;
-                    break;
-                case Models.DealWithLocalChanges.StashAndReaply:
-                    RadioStashAndReply.IsChecked = true;
-                    break;
-                default:
-                    RadioDiscard.IsChecked = true;
-                    break;
-            }
-        }
-
-        private void OnLocalChangeActionIsCheckedChanged(object sender, RoutedEventArgs e)
-        {
-            var vm = DataContext as ViewModels.CreateBranch;
-            if (vm == null)
-                return;
-
-            if (RadioDoNothing.IsChecked == true)
-            {
-                if (vm.PreAction != Models.DealWithLocalChanges.DoNothing)
-                    vm.PreAction = Models.DealWithLocalChanges.DoNothing;
-                return;
-            }
-
-            if (RadioStashAndReply.IsChecked == true)
-            {
-                if (vm.PreAction != Models.DealWithLocalChanges.StashAndReaply)
-                    vm.PreAction = Models.DealWithLocalChanges.StashAndReaply;
-                return;
-            }
-
-            if (vm.PreAction != Models.DealWithLocalChanges.Discard)
-                vm.PreAction = Models.DealWithLocalChanges.Discard;
-        }
     }
 }

src/Views/Pull.axaml

@@ -22,7 +22,7 @@
         <RowDefinition Height="32"/>
         <RowDefinition Height="32"/>
       </Grid.RowDefinitions>
-      
+
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -84,22 +84,14 @@
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.Pull.LocalChanges}"/>
       <WrapPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-        <RadioButton Content="{DynamicResource Text.Pull.LocalChanges.DoNothing}"
+        <RadioButton GroupName="LocalChanges"
-                     x:Name="RadioDoNothing"
                      Margin="0,0,8,0"
-                     GroupName="LocalChanges"
+                     Content="{DynamicResource Text.Pull.LocalChanges.StashAndReply}"
-                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
+                     IsChecked="{Binding !DiscardLocalChanges, Mode=TwoWay}"/>
-        <RadioButton Content="{DynamicResource Text.Pull.LocalChanges.StashAndReply}"
+        <RadioButton GroupName="LocalChanges"
-                     x:Name="RadioStashAndReply"
+                     Content="{DynamicResource Text.Pull.LocalChanges.Discard}"/>
-                     Margin="0,0,8,0"
-                     GroupName="LocalChanges"
-                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
-        <RadioButton Content="{DynamicResource Text.Pull.LocalChanges.Discard}"
-                     x:Name="RadioDiscard"
-                     GroupName="LocalChanges"
-                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
       </WrapPanel>
-      
+
       <CheckBox Grid.Row="4" Grid.Column="1"
                 Content="{DynamicResource Text.Pull.FetchAllBranches}"
                 IsChecked="{Binding FetchAllBranches, Mode=TwoWay}"/>

src/Views/Pull.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
@@ -9,51 +8,5 @@ namespace SourceGit.Views
         {
             InitializeComponent();
         }
-
-        protected override void OnLoaded(RoutedEventArgs e)
-        {
-            base.OnLoaded(e);
-
-            var vm = DataContext as ViewModels.Pull;
-            if (vm == null)
-                return;
-
-            switch (vm.PreAction)
-            {
-                case Models.DealWithLocalChanges.DoNothing:
-                    RadioDoNothing.IsChecked = true;
-                    break;
-                case Models.DealWithLocalChanges.StashAndReaply:
-                    RadioStashAndReply.IsChecked = true;
-                    break;
-                default:
-                    RadioDiscard.IsChecked = true;
-                    break;
-            }
-        }
-
-        private void OnLocalChangeActionIsCheckedChanged(object sender, RoutedEventArgs e)
-        {
-            var vm = DataContext as ViewModels.Pull;
-            if (vm == null)
-                return;
-
-            if (RadioDoNothing.IsChecked == true)
-            {
-                if (vm.PreAction != Models.DealWithLocalChanges.DoNothing)
-                    vm.PreAction = Models.DealWithLocalChanges.DoNothing;
-                return;
-            }
-
-            if (RadioStashAndReply.IsChecked == true)
-            {
-                if (vm.PreAction != Models.DealWithLocalChanges.StashAndReaply)
-                    vm.PreAction = Models.DealWithLocalChanges.StashAndReaply;
-                return;
-            }
-
-            if (vm.PreAction != Models.DealWithLocalChanges.Discard)
-                vm.PreAction = Models.DealWithLocalChanges.Discard;
-        }
     }
 }