Merge pull request #2007 from zofrex/issue-2000

Abort installation if Gemfile.lock contains merge conflict markers

Conflicts:
	lib/bundler.rb

1 files changed, 27 insertions, 0 deletions

diff --git a/spec/lock/lockfile_spec.rb b/spec/lock/lockfile_spec.rb
index 2f51a3b04a..30c4b22483 100644
--- a/spec/lock/lockfile_spec.rb
+++ b/spec/lock/lockfile_spec.rb
@@ -806,4 +806,31 @@ describe "the lockfile format" do
       end
     end
   end
+
+  it "refuses to install if Gemfile.lock contains conflict markers" do
+    lockfile <<-L
+      GEM
+        remote: file://#{gem_repo1}/
+        specs:
+      <<<<<<<
+          rack (1.0.0)
+      =======
+          rack (1.0.1)
+      >>>>>>>
+
+      PLATFORMS
+        ruby
+
+      DEPENDENCIES
+        rack
+    L
+
+    error = install_gemfile(<<-G, :expect_err => true)
+      source "file://#{gem_repo1}"
+      gem "rack"
+    G
+
+    expect(error).to match(/your Gemfile.lock contains merge conflicts/i)
+    expect(error).to match(/git checkout HEAD -- Gemfile.lock/i)
+  end
 end