gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-30 20:09:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4944 from gitbutlerapp/Fix-line-manager-forkpoint-integrated

Browse Source 
fix: Correct condition for removing right column
This commit is contained in:
Caleb Owens 2024-09-18 12:18:06 +02:00 committed by GitHub
commit 5e48159a83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/ui/src/lib/commitLines/lineManager.ts
View File

@ -412,7 +412,11 @@ function generateDifferentForkpoint({
}
// Remove one right column if there is only integrated with no local or remote commits
if (integratedBranchGroups.length > 0 && localBranchGroups.length === 0 && remoteBranchGroups) {
if (
integratedBranchGroups.length > 0 &&
localBranchGroups.length === 0 &&
remoteBranchGroups.length === 0
) {
removeRightMostColumn();
}