gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-18 14:31:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4985 from gitbutlerapp/fix-base-branch-blank-page

Browse Source
This commit is contained in:
Esteban Vega 2024-09-28 11:15:28 +02:00 committed by GitHub
commit 4b9421a851
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/desktop/src/lib/components/BaseBranch.svelte
View File

@ -67,8 +67,8 @@
style="pop"
kind="solid"
tooltip={`Merges the commits from ${base.branchName} into the base of all applied virtual branches`}
disabled={$mode?.type !== 'OpenWorkspace' || integrateUpstreamModal.imports.open}
loading={integrateUpstreamModal.imports.open}
disabled={$mode?.type !== 'OpenWorkspace' || integrateUpstreamModal?.imports.open}
loading={integrateUpstreamModal?.imports.open}
onclick={mergeUpstream}
>
Merge into common base