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

merged upstream

Browse Source
This commit is contained in:
Nikita Galaiko 2023-10-19 14:30:46 +02:00 committed by GitButler
commit 3331bf0831
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/ui/src/routes/repo/[projectId]/BranchLane.svelte
View File

@ -114,13 +114,10 @@
}
}
function push() {
if (localCommits[0]?.id) {
isPushing = true;
return branchController
.pushBranch({ branchId: branch.id, withForce: branch.requiresForce })
.finally(() => (isPushing = false));
}
async function push() {
isPushing = true;
await branchController.pushBranch({ branchId: branch.id, withForce: branch.requiresForce });
isPushing = false;
}
function merge() {
@ -552,7 +549,7 @@
</div>
{#if branch.commits.length > 0}
<div class="flex w-full flex-grow flex-col gap-2">
{#if localCommits.length > 0}
{#if localCommits.length > 0 || (branch.upstream && branch.upstream.commits.length > 0)}
<div
class="relative"
class:flex-grow={remoteCommits.length == 0}