Hi,

Maybe this has nothing to do with the SVN part but I'd like some
advice on how to stay in sync with multiple branches of an SVN project
while maintaining my own local modifications in git.

I'd like to apply my modifications starting at some early branch and
then move them to each subsequent branch in an automated way, or at
least one that minimizes conflicts.

I've cloned the SVN repository with git-svn and have these remote branches:

 upstream/trunk
 upstream/branch/BRANCH1
 upstream/branch/BRANCH2
 upstream/tags/BRANCH1_TAG1
 upstream/tags/BRANCH1_TAG2
 upstream/tags/BRANCH2_TAG1
 upstream/tags/BRANCH2_TAG2

what I want to end up with is a parallel set of local branches, like:

 local_trunk
 local_BRANCH1
 local_BRANCH2
 local_BRANCH1_TAG1
 local_BRANCH1_TAG2
 local_BRANCH2_TAG1
 local_BRANCH2_TAG2

so that they have my local modifications to the corresponding remote
branches.  I think it can be assumed that "BRANCH1_TAG1" and "BRANCH1"
share a common starting point on the SVN side.

Thanks for any guidance,
-Brett.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to