Git Svn woes, why oh why can I never dcommit?

Question

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?

Answer 1

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