Skip to content

fix: create branch dialog not respecting stash & reapply default preference #2473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
love-linger merged 1 commit into from
Jun 24, 2026
Merged

fix: create branch dialog not respecting stash & reapply default preference #2473

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/ViewModels/CreateBranch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ public CreateBranch(Repository repo, Models.Branch branch)
Name = branch.Name;

BasedOn = branch;
DealWithLocalChanges = Models.DealWithLocalChanges.DoNothing;
DealWithLocalChanges = Preferences.Instance.UseStashAndReapplyByDefault ?
Models.DealWithLocalChanges.StashAndReapply :
Models.DealWithLocalChanges.DoNothing;
UpdateOverrideTip();
}

Expand All @@ -89,7 +91,9 @@ public CreateBranch(Repository repo, Models.Commit commit)
_head = commit.SHA;

BasedOn = commit;
DealWithLocalChanges = Models.DealWithLocalChanges.DoNothing;
DealWithLocalChanges = Preferences.Instance.UseStashAndReapplyByDefault ?
Models.DealWithLocalChanges.StashAndReapply :
Models.DealWithLocalChanges.DoNothing;
UpdateOverrideTip();
}

Expand All @@ -101,7 +105,9 @@ public CreateBranch(Repository repo, Models.Tag tag)
_head = tag.SHA;

BasedOn = tag;
DealWithLocalChanges = Models.DealWithLocalChanges.DoNothing;
DealWithLocalChanges = Preferences.Instance.UseStashAndReapplyByDefault ?
Models.DealWithLocalChanges.StashAndReapply :
Models.DealWithLocalChanges.DoNothing;
UpdateOverrideTip();
}

Expand Down
Loading