Additional help messaging to help the user resolve a conflicted migration #16212
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ted 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.
| @@ -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." | |||
There was a problem hiding this comment.
As we are changing this already, should we use only one string here instead of concat a few. Something like:
raise Error, <<-MSG
Another migration is already named #{migration_file_name}:
#{existing_migration}. Use --force to replace this migration
or --skip to ignore conflicted file.
MSGThere was a problem hiding this comment.
@arthurnn Good idea. I've made a modification to eliminate the string concatenation.
|
👍 .. |
rafaelfranca
added a commit
that referenced
this pull request
Jul 18, 2014
…elp_messaging Additional help messaging to help the user resolve a conflicted migration
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added additional help messaging for command line scaffold generation. When 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 functionality already exists; I've just updated the help output to remind the user that skipping the migration creation is an option as well.