Git Svn困惑，为什么哦为什么我永远不会dcommit？ [英] Git Svn woes, why oh why can I never dcommit?

问题描述

git svn克隆http：// myrepo / myrepo

code>

我不想在master中工作：

  git checkout -b开发
  

破解一段时间。

  git的结帐主
的git svn的底垫
 GIT中变基发展
的git svn的dcommit 
  

到目前为止都很好，自从我上次看起来没人提交，svn rebase没有做任何修改，

 在commit期间合并冲突：文件或目录'inc / data.inc'已过期;尝试更新：资源过时;尝试更新/ usr / local / git / libexec / git-core / git-svn第576行
  

那么，没有SVN先生，没有。我问你最新的一个，你说我已经有了。它的不同之处在于我改变了它。

这里发生了什么，为什么我不能提交？

解决方案

我认为你滥用 git rebase 。试试这个：

我不想在master中工作：

  git checkout -b开发
  

破解一段时间。

  git checkout master 
 git svn rebase 
 git checkout开发
 git rebase master 
 git svn dcommit 
  

或者，$ b的简写
$ b

  git checkout development 
 git rebase master 
  

是

  git rebase master development 
  

I have a git svn repository.

git svn clone http://myrepo/ myrepo

I dont want to work in master:

git checkout -b development

hack for a while.

git checkout master
git svn rebase
git rebase development
git svn dcommit

so far all good, it appears noone has committed since i did last, svn rebase doesnt make any changes and my rebase from development works a-ok.

Merge conflict during commit: File or directory 'inc/data.inc' is out of date; try updating: resource out of date; try updating at /usr/local/git/libexec/git-core/git-svn line 576

Well, no Mr SVN, its not. I asked you for the latest one and you said I had it already. Its different because I changed it.

What is going on here, why can I not commit?

解决方案

I think you're misusing git rebase. Try this instead:

I dont want to work in master:

git checkout -b development

hack for a while.

git checkout master
git svn rebase
git checkout development
git rebase master
git svn dcommit

Or, the shorthand for

git checkout development
git rebase master

is

git rebase master development

这篇关于Git Svn困惑，为什么哦为什么我永远不会dcommit？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！