diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-18 18:21:53 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-18 18:22:37 -0300 |
| commit | 533c035205a49e7ce9e23661b326d37d9f43dc03 (patch) | |
| tree | ac1bbca69873c69aebe1af44f042a3a705e321e6 /railties/lib/rails/generators/actions | |
| parent | dc59a08fe74d7a6e6b789bcc775087eb94e05311 (diff) | |
| parent | cc1ad787af462e03be5ff1805c3d176569cc1e2f (diff) | |
| download | rails-533c035205a49e7ce9e23661b326d37d9f43dc03.tar.gz rails-533c035205a49e7ce9e23661b326d37d9f43dc03.tar.bz2 rails-533c035205a49e7ce9e23661b326d37d9f43dc03.zip | |
Merge pull request #16212 from aantix/additional_migration_conflict_help_messaging
Additional help messaging to help the user resolve a conflicted migration
Diffstat (limited to 'railties/lib/rails/generators/actions')
| -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..682092fdf2 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 |