gitbutler icon indicating copy to clipboard operation
gitbutler copied to clipboard

Published 20 hours ago • verified publisher icon gitbutlerapp

File is locked in two virtual branches for the same changes

Open endercrest opened this issue 1 year ago • 2 comments

Observing some odd behaviour around the file locking mechanism. In the picture below, the typeConversions.ts file has incorrectly been locked into two branches simultaneously. It seems GitButler has gotten confused and has "reverted" the initial changes and locked that to the non-default branch and then re-applied those changes to the default branch and locked it

Background: typeConversions.ts was previously changed in the non-default branch. And there are no associated changes in the default branch.

image

endercrest avatar Feb 22 '24 20:02 endercrest

@endercrest #3136 which I suspect had the same root cause was fixed in the latest nightly (0.5.408), so this might be too.

daniilS avatar Apr 16 '24 12:04 daniilS

Hey @endercrest - thanks for reporting this. A few months back we had quite a number of these kinds of issue, with many people on Discord pinging us about it. I think we have squashed most of the bugs in this area now. Are you still experiencing this type of issue in the more recent versions of the app?

krlvi avatar Aug 16 '24 11:08 krlvi