diff options
| author | Jim Jones <jjones@aantix.com> | 2014-07-17 21:19:07 -0700 |
|---|---|---|
| committer | Jim Jones <jjones@aantix.com> | 2014-07-17 21:19:07 -0700 |
| commit | af3cf61aa7e139b8e8b446b65494f14cfcc538ce (patch) | |
| tree | 909ca46a495c07d79efa99aad2efeaffd5ed0a89 /railties/lib/rails | |
| parent | d4c8068675f0b6be025590471b40ff175daa845e (diff) | |
| download | rails-af3cf61aa7e139b8e8b446b65494f14cfcc538ce.tar.gz rails-af3cf61aa7e139b8e8b446b65494f14cfcc538ce.tar.bz2 rails-af3cf61aa7e139b8e8b446b65494f14cfcc538ce.zip | |
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.
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/actions/create_migration.rb | 3 |
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 |