Submodule conflict handling failures don't always report the full error

When merging detects a submodule conflict, but details about the conflict cannot be recorded in the repository for display in the UI, the error message logged does not include the cause of the failure.