We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 3a21f77 commit e96806aCopy full SHA for e96806a
app/src/ui/app.tsx
@@ -2078,14 +2078,8 @@ export class App extends React.Component<IAppProps, IAppState> {
2078
)
2079
}
2080
case PopupType.LocalChangesOverwritten:
2081
- const selectedState = this.state.selectedState
2082
-
2083
- const existingStash =
2084
- selectedState !== null &&
2085
- selectedState.type === SelectionType.Repository
2086
- ? selectedState.state.changesState.stashEntries.length > 0
2087
- : false
2088
+ // Now that we support multiple stashes, lie to the dialog so that it always shows the "stash changes" option.
+ const existingStash = false
2089
return (
2090
<LocalChangesOverwrittenDialog
2091
repository={popup.repository}
0 commit comments