gemfile.lock

I keep running into the following error with my Gemfile.lock whenever I want to do a git pull or checkout a new branch. error: Your local changes to the following files would be overwritten by merge: Gemfile.lock Please, commit your changes or stash them before you can merge. Aborting The problem is that I can't figure out how to fix it. Stashing the file doesn't work -- the local changes just stay there for some reason. I've also tried running git checkout -- Gemfile.lock to discard the changes, but that doesn't work either -- the local changes just stay there. I've also tried creating a new

After running the bundle install command, 'Gemfile.lock ' is created in the working directory. What do the directives inside that file mean? For example, let's take the following file: PATH remote: . specs: gem_one (0.0.1) GEM remote: http://example.org/ specs: gem_two (0.0.2) gem_three (0.0.3) gem_four (0.0.4) PLATFORMS platform DEPENDENCIES gem_two gem_one! What do ' PATH ', ' GEM ', ' PLATFORMS ' and ' DEPENDENCIES ' describe? Are all of them required? What should contain the ' remote ' and ' specs ' subdirectives? What does the exclamation mark after the gem name in the ' DEPENDECIES '

I am a beginner to Ruby on Rails and I am using Rails 3.0.9. What is the difference between Gemfile and Gemfile.lock in Rails? Dylan Markow The Gemfile is where you specify which gems you want to use, and lets you specify which versions. The Gemfile.lock file is where Bundler records the exact versions that were installed. This way, when the same library/project is loaded on another machine, running bundle install will look at the Gemfile.lock and install the exact same versions, rather than just using the Gemfile and installing the most recent versions. (Running different versions on