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

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

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();
}