Cherry-Pick to return the conflict files

[itaiad200]

There's no equivalent diff to perform so it's hard for the user to figure out the conflicting files.

[github-actions]

This issue is now marked as stale after 90 days of inactivity, and will be closed soon. To keep it, mark it with the "no stale" label.