Main branch is shown as an integrated branch instead of base

[cascer1]

Version

0.19.10

Operating System

Windows

Distribution Method

winget (Windows)

Describe the issue

I started using GitButler on an existing repository. For this, I made sure that I was on the main branch and all my previous feature branches had been merged. This is as clean of a state as I could manage.

However, GitButler keeps showing main as a branch instead of the common base and I can't find out how I can solve this.

I've attached screenshots of several interfaces showing the current state. They need to be somewhat redacted because of the nature of the project but hopefully all the relevant information is still present.

GitButler UI

but status output
Here you can see that there is a stack of two branches (namely main and my feature branch) with a common base below.

IntelliJ Git log
Here you see how entries in GitButler line up with the Git log in IntelliJ.

EDIT: I missed this while making the above screenshot, but there is the gitbutler workspace commit above the top one visible in the IntelliJ view:

How to reproduce (Optional)

No response

Expected behavior (Optional)

Main should not show as a branch that can be removed or unapplied.

Relevant log output (Optional)

[Byron]

Thanks a lot for reporting.

I think the problem here is twofold. For one, it's unexpected to see the local tracking branch of the target as segment. This should be fixed.
The second is that it may be surprising that integrated commits show up at all (probably after applying), and that is due to having a stored anchor in the past which is associated to the workspace. This makes the workspace think it was forked off in the past, and now a branch 'from the future' is applied, and it naturally includes these integrated commits.

We will be working on a solution for that, probably to let each stack track their own fork-point, so newly applied branches appear just like in the branch list before.