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.

1 files changed, 2 insertions, 1 deletions

diff --git a/railties/lib/rails/generators/actions/create_migration.rb b/railties/lib/rails/generators/actions/create_migration.rb
index cf3b7acfff..b4701b9591 100644
--- a/railties/lib/rails/generators/actions/create_migration.rb
+++ b/railties/lib/rails/generators/actions/create_migration.rb
@@ -55,7 +55,8 @@ module Rails
           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