-
Notifications
You must be signed in to change notification settings - Fork 518
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conflicted commit getting checked out into working directory #5247
Comments
Thanks for reporting! I think it would be good to re-open this issue as the image I see there shows a 'virtual tree', checked out into the worktree, which should never happen. Maybe I am wrong about this, and @Caleb-T-Owens would definitely know better. Also, the performance issues is something we are working on, there are a couple of known ones that still need to be sorted out, but this one here seems like a bug to me that may have caused a performance issue to surface. |
This indeed should never ever happen. @Afsoon would you be able to send in your log files or describe/provide a reproduction for this issue, because it would be really good to get to the bottom of this. You can find your log files with this guide: https://docs.gitbutler.com/development/debugging Sorry for the inconvenience. |
@Caleb-T-Owens I'm sending right now the logs. I don't know how to reproduce it exactly, but I can give you more information:
After update to the latest version:
Don't worry! The software is pre 1.0 and I know what I'm into it. |
I don't now if it can help you, but I had to do a Stats before the git prune, using
After prune it:
|
Version
Version 0.13.3 (20241021.130557)
Operating System
macOS
Distribution Method
dmg (Apple Silicon)
Describe the issue
Unable to see the changes after apply a branch or If I create a branch.
Some screenshots:
Create a branch
Apply a branch
How to reproduce
Just create a new branch or apply a old branch
Expected behavior
To be able to see my branches.
Relevant log output
The text was updated successfully, but these errors were encountered: