From: davetron5000 <davetron5000@gmail.com>
Date: Wed, 21 May 2008 15:50:33 GMT
Subject: Using git to perform merges between SVN branches
Message-ID: <a5c338c9-7820-41bd-a3a3-36ba5aad4379@l64g2000hse.googlegroups.com>

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