development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-08-28 12:40:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15471 from angusdev/issue-13081-menu-disabled

Browse source 
Fix menu items disabled if close the "Resolve conflicts before Rebase" dialog
This commit is contained in:
tidy-dev 2022-10-19 08:51:15 -04:00 committed by GitHub
parent f4d8e8cc77 afc2fac625
commit 526af4be51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/ui/multi-commit-operation/base-multi-commit-operation.tsx
View file

@ -93,6 +93,8 @@ export abstract class BaseMultiCommitOperation extends React.Component<IMultiCom
{targetBranch !== null ? <strong>{targetBranch.name}</strong> : null}
</>
)
this.props.dispatcher.closePopup(PopupType.MultiCommitOperation)
return dispatcher.onConflictsFoundBanner(
repository,
operationDescription,