Hi, This isn't really a git ML, but perhaps some of you have had similar struggles in dealing with the switch to git and can give me some suggestions. I used to keep my organization's SVN version of QP up-to-date with `svn merge` pretty easily. Now that QP is in Git, I'd like to see if there's a way to continue to effortlessly synchronize with Git. I've looked into git-svn, which looks like it makes it very easy to create an SVN branch with every single Git commit represented as an SVN commit. However, my organization's SVN Czar is not thrilled with the idea of ballooning our history by a thousand or so commits. What I would really like to do is 'merge everything from commit XYZ to HEAD' in a single commit to SVN, with either git or svn presenting any conflicts that might arise. Can anyone suggest how I can accomplish this?
Thanks in advance -Jared