diff options
| author | zofrex <zofrex@gmail.com> | 2012-07-09 12:14:49 +0100 |
|---|---|---|
| committer | zofrex <zofrex@gmail.com> | 2012-07-09 12:14:49 +0100 |
| commit | b6cd3d0e93c8ff9b66ef0afbdb3f15188dbbb549 (patch) | |
| tree | c313189f0dc5059fa79c6a56edb694f781d72c1a /lib/bundler/lockfile_parser.rb | |
| parent | 2a35e1804e8798df22e96f6f393d6106b9b8c854 (diff) | |
| download | bundler-b6cd3d0e93c8ff9b66ef0afbdb3f15188dbbb549.tar.gz | |
Issue #2000 improve error message
Diffstat (limited to 'lib/bundler/lockfile_parser.rb')
| -rw-r--r-- | lib/bundler/lockfile_parser.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/lockfile_parser.rb b/lib/bundler/lockfile_parser.rb index 04c8782bb1..609a095b04 100644 --- a/lib/bundler/lockfile_parser.rb +++ b/lib/bundler/lockfile_parser.rb @@ -27,7 +27,7 @@ module Bundler elsif line == "PLATFORMS" @state = :platform elsif line.include?("<<<<<<<") || line.include?("=======") || line.include?(">>>>>>>") || line.include?("|||||||") - raise LockfileError, "Lockfile contains conflict markers, cowardly refusing to run" + raise LockfileError, "Gemfile.lock contains merge conflicts. Please check out a valid Gemfile.lock and try again." else send("parse_#{@state}", line) end |