diff --git a/src/Models/DealWithLocalChanges.cs b/src/Models/DealWithLocalChanges.cs index 82609642..f308a90c 100644 --- a/src/Models/DealWithLocalChanges.cs +++ b/src/Models/DealWithLocalChanges.cs @@ -2,8 +2,8 @@ { public enum DealWithLocalChanges { + DoNothing, StashAndReaply, Discard, - DoNothing, } } diff --git a/src/ViewModels/Checkout.cs b/src/ViewModels/Checkout.cs index ade6d2f8..7f7d1c00 100644 --- a/src/ViewModels/Checkout.cs +++ b/src/ViewModels/Checkout.cs @@ -78,6 +78,6 @@ namespace SourceGit.ViewModels } private readonly Repository _repo = null; - private Models.DealWithLocalChanges _preAction = Models.DealWithLocalChanges.StashAndReaply; + private Models.DealWithLocalChanges _preAction = Models.DealWithLocalChanges.DoNothing; } } diff --git a/src/ViewModels/CreateBranch.cs b/src/ViewModels/CreateBranch.cs index aa3dc165..e80dec15 100644 --- a/src/ViewModels/CreateBranch.cs +++ b/src/ViewModels/CreateBranch.cs @@ -138,6 +138,6 @@ namespace SourceGit.ViewModels private readonly Repository _repo = null; private string _name = null; private readonly string _baseOnRevision = null; - private Models.DealWithLocalChanges _preAction = Models.DealWithLocalChanges.StashAndReaply; + private Models.DealWithLocalChanges _preAction = Models.DealWithLocalChanges.DoNothing; } } diff --git a/src/ViewModels/Pull.cs b/src/ViewModels/Pull.cs index b4f06a9d..44287138 100644 --- a/src/ViewModels/Pull.cs +++ b/src/ViewModels/Pull.cs @@ -162,6 +162,6 @@ namespace SourceGit.ViewModels private Models.Remote _selectedRemote = null; private List _remoteBranches = null; private Models.Branch _selectedBranch = null; - private Models.DealWithLocalChanges _preAction = Models.DealWithLocalChanges.StashAndReaply; + private Models.DealWithLocalChanges _preAction = Models.DealWithLocalChanges.DoNothing; } } diff --git a/src/Views/Checkout.axaml b/src/Views/Checkout.axaml index 501b3de0..02ed64b7 100644 --- a/src/Views/Checkout.axaml +++ b/src/Views/Checkout.axaml @@ -31,18 +31,18 @@ - + + - diff --git a/src/Views/CreateBranch.axaml b/src/Views/CreateBranch.axaml index 007ae537..a6565807 100644 --- a/src/Views/CreateBranch.axaml +++ b/src/Views/CreateBranch.axaml @@ -65,18 +65,18 @@ - + + - + -