Unable to create commit (workspace merge conflict)

[DanielGasparik]

Version

0.17.6

Operating System

macOS

Distribution Method

dmg (Mac OS - Apple Silicon)

Describe the issue

I am unable to create a commit. I get an error message "Workspace merge conflict" however the diff shown is empty.

How to reproduce (Optional)

No response

Expected behavior (Optional)

No response

Relevant log output (Optional)

[Byron]

Thanks a lot for reporting!

I think in this case, there isn't a diff available to the frontend, and maybe it would be better to hide the patch list if it's empty? Maybe there are other options as well, @estib-vega may have ideas.

Beyond that confusion around the diff, I think it's hard to give good advice in this case. My aspiration would be that it's able to figure out which stack is conflicting, and with the new workspace commit merge implementation, that's actually possible as well.