Using git to perform merges between SVN branches

[davetron5000 <davetron5000@xxxxxxxxx>]

Working out of an SVN/subversion repository.  Initially cloned it so I
could work with git via git-svn.  I was given a branch in svn to work
on.  Created local branches connected to the main trunk and my branch
via:

git-checkout -b local-trunk trunk
git branch local-foo FOO

where svn_root/branches/FOO is where I'm to commit changes

commits work fine, etc.

What I'd like to do, for simplicity, and as a demonstration of git's
superior merging, is to do the merge of my code to the main trunk
using git.  My main concern is not getting into a situation where I
cannot commit to svn (since it doesn't track merges)

Would something like this work:

git checkout local-trunk
git-svn rebase
git checkout -b merge-foo local-trunk
git merge local-foo
# Resolve conflicts, etc.  local-foo now has what should go onto SVN's
trunk
git checkout local-trunk
git merge merge-foo
# this should work without any conflicts, since I resolved them on
merge-foo
git-svn dcommit
# Now I've merged my changes to the main trunk

Thanks,

Dave
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html