混帳SVN變基誤差

Question

我正在運行git的svn重訂後出現以下錯誤：「更新指標--refresh：命令返回的錯誤：1」

任何想法？以下是整個輸出。

$ git svn rebase --dry-run 
xxx-iphone/xxx_prototype2/xxx_prototype2.xcodeproj/project.pbxproj: needs update 
xxx-iphone/xxx_prototype2/xxx_prototype2.xcodeproj/project.xcworkspace/xcuserdata/xxx.xcuserdatad/UserInterfaceState.xcuserstate: needs update 
xxx-iphone/xxx/xxx_prototype2/CouponBookViewController.h: needs update 
xxx-iphone/xxx_prototype2/xxx_prototype2/CouponBookViewController.m: needs update 
xxx-iphone/xxx_prototype2/xxx_prototype2/EmailListViewController.m: needs update 
xxx-iphone/xxx_prototype2/xxx_prototype2/HomeViewController.h: needs update 
xxx-iphone/xxx_prototype2/xxx_prototype2/ParentCategoryTableViewCell.xib: needs update 
xxx-rails/.rvmrc: needs update 
xxx-rails/Gemfile: needs update 
xxx-rails/app/controllers/admin_page/categories_controller.rb: needs update 
xxx-rails/app/controllers/application_controller.rb: needs update 
xxx-rails/app/controllers/categories_controller.rb: needs update 
xxx-rails/app/controllers/service_provider_profiles_controller.rb: needs update 
xxx-rails/app/models/category.rb: needs update 
xxx-rails/app/models/like.rb: needs update 
xxx-rails/app/models/service_provider_profile.rb: needs update 
xxx-rails/config/application.rb: needs update 
xxx-rails/db/development.sqlite3: needs update 
update-index --refresh: command returned error: 1 

Answer 1

添加更新的文件（git add -u）和運行git svn rebase之前提交。