git svn dcommit失败
[英]git svn dcommit fail
问题描述
when I do git svn dcommit, it report error like below: 
当我执行git svn dcommit时，它报告如下错误：
git svn dcommit
Committing to http://192.168.33.203/svn/repos/mt6577/platform/branches/vendor-ALPS.ICS2.6577.SP.V1_HUAQIN77_CU_ICS ...
summit merge conflict: file or directory “mediatek/platform/mt6577/external/meta/sgx” is out of date；please update: resource out of date; try updating at /usr/local/libexec/git-core/git-svn line 579
My operations: 我的操作：
do three commits(commit34,commit35,commit36) in local
在本地执行三个commit（commit34，commit35，commit36） git svn dcommit these three commits to svn
git svn将这三个提交提交给svn amend commit34,commit35 by rebase command
通过rebase命令修改commit34，commit35 git svn dcommit , then report above error.
git svn dcommit，然后报告以上错误。
How to handle the error, thanks much. 如何处理错误，非常感谢。
1 个解决方案
解决方案1
3 已采纳 2012-07-28 04:12:43
First thing, never rebase commits that you have pushed back to repository when using git. 首先， 永远不要对使用git时已推送回存储库的提交进行重新基准化。 Although you are working with git-svn, rebase these commits is not a good idea. 虽然你与混帐svn的工作， rebase这些提交不是一个好主意。 Why? 为什么？ Because rebase alters the commit history, this is ok when you just work in local. 由于rebase改变提交历史，这是确定的，当你只是在本地工作。
In your case, you can run git svn fetch/rebase and resolve any conflict, then dcommit it back. 就您而言，您可以运行git svn fetch/rebase并解决任何冲突，然后dcommit其重新dcommit 。
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.