Empty list of stashed conflicting branches

[gwilymatgearset]

Version

0.12.16

Operating System

Windows

Distribution Method

msi (Windows)

Describe the issue

How to reproduce

There was a merge conflict in one of my virtual branches (I had 4 at the time, 2 which didn't conflict, 1 was integrated and the conflicting one).

Pressed the update button and got this modal.

I'm not sure if it is necessary, but the branch itself was filtered out of the branch view because it is considered inactive and I had that filter enabled.

Expected behavior

Include the names of the branches which had merge conflicts.

Relevant log output

No response

[Byron]

Thanks for reporting.

Note that #4472 is the same error message, but let's keep both issues in case this helps with reproduction.