git-svn重设错误 [英] git-svn rebase error

问题描述

运行git svn rebase后出现以下错误：'update-index --refresh：command returned error：1'

任何想法？下面是整个输出。

  $ git svn rebase --dry-run 
 xxx-iphone / xxx_prototype2 / xxx_prototype2 .xcodeproj / project.pbxproj：需要更新
 xxx-iphone / xxx_prototype2 / xxx_prototype2.xcodeproj / project.xcworkspace / xcuserdata / xxx.xcuserdatad / UserInterfaceState.xcuserstate：需要更新
 xxx-iphone / xxx / xxx_prototype2 /CouponBookViewController.h：需要更新
 xxx-iphone / xxx_prototype2 / xxx_prototype2 / CouponBookViewController.m：需要更新
 xxx-iphone / xxx_prototype2 / xxx_prototype2 / EmailListViewController.m：需要更新
 xxx-iphone /xxx_prototype2/xxx_prototype2/HomeViewController.h：需要更新
 xxx-iphone / xxx_prototype2 / xxx_prototype2 / ParentCategoryTableViewCell.xib：需要更新
 xxx-rails / .rvmrc：需要更新
 xxx-rails / Gemfile：需要更新
 xxx-rails / app / controllers / admin_page / categories_controller.rb：需要更新
 xxx-rails / app / controllers / application_controller.rb：需要更新
 xxx-rails /应用程序/控制器/ catego ries_controller.rb：需要更新
 xxx-rails / app / controllers / service_provider_profiles_controller.rb：需要更新
 xxx-rails / app / models / category.rb：需要更新
 xxx-rails / app / models / like.rb：需要更新
 xxx-rails / app / models / service_provider_profile.rb：需要更新
 xxx-rails / config / application.rb：需要更新
 xxx- rails / db / development.sqlite3：需要更新
 update-index --refresh：命令返回错误：1 
  

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

I am getting the following error after running git svn rebase: 'update-index --refresh: command returned error: 1'

Any ideas? Below is the entire output.

$ 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

解决方案

Add the updated files (git add -u) and commit before running git svn rebase.

这篇关于git-svn重设错误的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！