mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
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.
This commit is contained in:
parent
d4c8068675
commit
af3cf61aa7
1 changed files with 2 additions and 1 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue