When merging between svn branches with git-svn
As described here, when doing something like:
$ git checkout some-svn-branch
$ git merge --squash master
$ git commit -m 'merging changes from branch to master'
$ git svn dcommit
The —squash is important. Without it your branch has an identity crisis and “git svn dcommit” tries to talk to the trunk svn url instead of the branch.
