After doing a git stash pop that resulted in a conflict, which I resolved, the UI won't let me commit and won't tell me how to continue. See the attached screenshot.

The file in conflicted state does not have a checkbox, so it's not clear how to proceed. What's more, if you click the "All files" checkbox, the conflicted state does now get checked, but the Commit button is not enabled.

This is solved by doing a "Stage current file", as you'd do on the command-line.