mirror of
https://github.com/desktop/desktop
synced 2024-09-19 08:02:22 +00:00
Merge pull request #15471 from angusdev/issue-13081-menu-disabled
Fix menu items disabled if close the "Resolve conflicts before Rebase" dialog
This commit is contained in:
parent
be3868e2ee
commit
d47d694fc9
|
@ -93,6 +93,8 @@ export abstract class BaseMultiCommitOperation extends React.Component<IMultiCom
|
||||||
{targetBranch !== null ? <strong>{targetBranch.name}</strong> : null}
|
{targetBranch !== null ? <strong>{targetBranch.name}</strong> : null}
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
|
|
||||||
|
this.props.dispatcher.closePopup(PopupType.MultiCommitOperation)
|
||||||
return dispatcher.onConflictsFoundBanner(
|
return dispatcher.onConflictsFoundBanner(
|
||||||
repository,
|
repository,
|
||||||
operationDescription,
|
operationDescription,
|
||||||
|
|
Loading…
Reference in a new issue