Git-svn reinstallation error

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

Any ideas? Below is the whole conclusion.

$ 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 
+6
source share
1 answer

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

+7
source

Source: https://habr.com/ru/post/909603/


All Articles