Added additional help messaging when there's scaffolding being generated and a migration already exists for the resource.

The user is now alerted that they are able to skip the conflicted migration file via the --skip option.
Modified migration conflict message to remove the string concatenation.
Merge pull request #16212 from aantix/additional_migration_conflict_help_messaging

Additional help messaging to help the user resolve a conflicted migration