Add resolution note to SSA conflict message

[lblackstone]

For SSA conflicts, add a note about using the "patchForce" annotation to overwrite the existing resource values

Proposed changes

Fix #2157

Here's an example of the updated error message

Diagnostics:
  kubernetes:apps/v1:DeploymentPatch (example):
    error: resource default/foo was not successfully created by the Kubernetes API server : use the "pulumi.com/patchForce" annotation if you want to overwrite the existing values: Apply failed with 1 conflict: conflict with "kubectl-client-side-apply" using apps/v1: .spec.template.spec.containers[name="nginx"].image

Related issues (optional)

[github-actions]

Does the PR have any schema changes?

Looking good! No breaking changes found.
No new resources/functions.

[squaremo]

Nice and simple, like it :-D
Worth a test case though?

[squaremo]

I initially wondered if it would read better with the advice at the end; but, I think it's better to have it as you'd done, with the important information ("there's a problem, here's how to fix it") first.

[lblackstone]

Worth a test case though?

I don't usually add tests for stuff like this. What kind of test coverage would you say is valuable for error messages?

[squaremo]

I don't usually add tests for stuff like this. What kind of test coverage would you say is valuable for error messages?

In general, I draw the line somewhere short of testing for specific error messages and log messages. However, the change here is to give advice in a specific situation, which happens to be when reporting an error. Providing evidence that it really does give that advice in that stuation helps make the case for including the change.

Writing down the steps to try it out would work OK, but a test case would also act as an alarm if assumptions decay.