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.
Update outdated test.

The current test is asserting against an outdated version of
Request#method where HEAD requests are treated as GET requests.
Update test to clearly reflect what it is testing for.
Fix duplicated test.

There is already another test covering Request#request_method. This
test should cover Request#method.
Remove redundant test.

Since we're stubbing the request, the test is actually just asserting
that `@method = env['REQUEST_METHOD']`. In order to the test against
the methodoverride middleware, we should test it against an actual
request. However, Rack is already covering this scenario so we can
remove this test.
Modified migration conflict message to remove the string concatenation.
create_join_table uses same logic as HABTM reflections

Before this change, create_join_table would not remove the common prefix
in the join table name, unlike ActiveRecord::Reflections. A HABTM
between Music::Artist and Music::Record would use a table
music_artists_records, while create_join table would create
music_artists_music_records.
Merge pull request #16212 from aantix/additional_migration_conflict_help_messaging

Additional help messaging to help the user resolve a conflicted migration
Merge pull request #16098 from tgxworld/fixes_to_request_test

Fixes to request method test.
small refactors to actionview renderers
marking private methods which dont work if called on their own anyways
adding missing test coverage
Fixed typo in comment
Merge pull request #16219 from skanev/fix-create-join-table-with-common-prefix

Make create_join_table use the same logic as HABTM reflections
Merge pull request #16227 from Aguynamedsteve/typo_correction

Fixed typo in comment [ci skip]
Merge pull request #16224 from egilburg/renderer_refactors

Some ActionView renderer refactors