diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2022-05-29 16:47:22 +0200 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2022-05-31 16:13:52 +0900 |
| commit | e2b421d679d7ebd2c7d6b44a96c8353b81e447b9 (patch) | |
| tree | 69a4b40c6b6900e3fb5e4ccf3bf0810074df28e2 /lib/bundler | |
| parent | 9241d75a615f652dee45bc999524cc3c6ede8c5d (diff) | |
| download | ruby-e2b421d679d7ebd2c7d6b44a96c8353b81e447b9.tar.gz | |
[rubygems/rubygems] Give better conflict resolution advice
This alternative really uses only the Gemfile, and can never end up
being absurd, because it will never be suggested when there's no
lockfile, and it suggests deleting the lockfile.
https://github.com/rubygems/rubygems/commit/5d154dd50e
Diffstat (limited to 'lib/bundler')
| -rw-r--r-- | lib/bundler/resolver.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index 8ec6d5dbc0..d749694952 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -395,7 +395,7 @@ module Bundler o << %(\n Current #{name} version:\n #{SharedHelpers.pretty_dependency(@metadata_requirements.find {|req| req.name == name })}\n\n) elsif conflict.locked_requirement o << "\n" - o << %(Running `bundle update` will rebuild your snapshot from scratch, using only\n) + o << %(Deleting your #{name_for_locking_dependency_source} file and running `bundle install` will rebuild your snapshot from scratch, using only\n) o << %(the gems in your Gemfile, which may resolve the conflict.\n) elsif !conflict.existing o << "\n" |