我检查了'production_branch',然后合并了'master_branch for_production_branch',发生了大规模的冲突.'production_branch'已部署到生产中.但冲突需要更有经验的眼光.我需要在生产分支'production_branch'上获得一个关键补丁(我将手工完成),以便我可以部署.
git co 'production_branch' # =>
lib/tasks/foobar.rake: needs merge
vendor/plugins/acts_as_syncable/lib/active_record/whatever.rb: needs merge
error: you need to resolve your current index first
和
git co 'master_branch for_production_branch'
lib/tasks/foobar.rake: needs merge
vendor/plugins/acts_as_syncable/lib/active_record/whatever.rb: needs merge
error: you need to resolve your current index first
如何在工作目录中返回'production_branch',这样我就可以部署一个简单的关键修复程序.