How to handle this error "Can not manage this hunk because it depends on changes from multiple branches"

[nachocab]

What is the improvement or update you wish to see?

I somehow got this error yesterday and had no idea what caused it or how to fix it.

I ended up manually checking out my branch, committing with git and deleting the /refs/gitbutler folder, but I'm sure this isn't the best approach.

Is there any context that might help us understand?

No response

Does the docs page already exist? If so, please link to it.

No response

[Byron]

Thanks a lot for reporting, and apologies for the late reply.

For posterity, here is the response on Discord.

The short version is that this will be a thing of the past with the next major release, which is close to see its first release. This also means that it's unlikely to be fixed in the current incarnation of the application.