Merge pull request #16212 from aantix/additional_migration_conflict_help_messaging

Additional help messaging to help the user resolve a conflicted migration

railties/lib/rails/generators/actions/create_migration.rb

@@ -55,7 +55,8 @@ def on_conflict_behavior(&block)
           else
             say_status :conflict, :red
             raise Error, "Another migration is already named #{migration_file_name}: " +
-                         "#{existing_migration}. Use --force to replace this migration file."
+              "#{existing_migration}. Use --force to replace this migration " +
+              "or --skip to ignore conflicted file."
           end
         end