On 02/03/2011 08:03 AM, Diego Novillo wrote:
- I wanted to merge branch 'b2' into branch 'b1'$ git checkout b1 $ git svn rebase $ git merge b2 < ... fix whatever needs fixing in the merge ... > $ git rebase -i @{u}
I'm surprised at the error that you saw, but I'm not surprised that you had trouble.
In looking for online references to the problem, I found several postings recommending not to do svn branch merges using git-svn (http://stackoverflow.com/questions/190431/is-git-svn-dcommit-after-merging-in-git-dangerous). Jason, Tom, do you merge svn branches using git svn? How do you do it?
I don't, really. Since the SVN repository doesn't know the merge history, trying to merge and rebase is likely to get confused. I don't remember exactly what I did when I was dealing with the lambda branch, but I think I just did periodic diffs much like old-style SVN merges.
For constexpr I switched to having the branch only in git, which made things much easier.
Have you tried "git merge --squash" without the rebase? That seems like it might do the trick for you.
Jason
