tags:

views:

7

answers:

0
Q: 

Conflict discovered in 'Gemfile'

When I run this command in deploy.rb (Capistrano):

run "cd /sites/rails-data/#{application}/current/ && svn up Gemfile && bundle install --without=test"

Capistrano get stuck with:

Conflict discovered in 'Gemfile'

How can I solve this issue is I do not what is the problem?

related questions

What is your preferred php deployment strategy?
Primary servers in capistrano
Deny access to .svn folders on Apache
git archive vs cp -R
How do I use frozen Capistrano part 2?
How do I use frozen Capistrano?
Using Capistrano to deploy (a non-Rails site) via FTP?
How do I run a rake task from Capistrano?
Capistrano - RAILS_GEM_VERSION Error
How could I 'nice' Capistrano deployment ?
Using capistrano when remote git is on a non-standard path
Keeping static files in server when deploying with Capistrano
How do I force Capistrano deployed app to use my development database?
Capistrano: How to Include common settings in multiple project deploy.rb files
Capistrano for Java?
Capistrano + thin + nginx with user not allowed to sudo howto?
Capistrano not restarting Mongrel clusters properly
What's the best way to deploy a JRuby on Rails application to Tomcat?
Cap invoke and sudo
How to do a rolling restart of a cluster of mongrels
What is the best practice for an environment based configuration file in Ruby on Rails
What should I do with the vendor directory with respect to subversion?
How could I get my SVN-only host to pull from a git repository?
Deploying a Git subdirectory in Capistrano
Any capistrano comparable for windows/.net?