On Thu, Feb 3, 2011 at 01:11, Basile Starynkevitch <bas...@starynkevitch.net> wrote:
> I am switching to daily use git for the MELT branch. What is the > command to avoid making the same mistake? Any general clues on using > git for GCC work is welcome. I did read > http://gcc.gnu.org/wiki/GitMirror and Dodji dodji<at>seketeli... gave > me precious advices about it. Well, I think I'm going to give up on using git svn for merges. When doing my own patches, I squash multiple local commits with 'git rebase -i'. However, I was trying to do the following merge and that failed: - 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} When rebase offered me the list of commits to edit, everything looked fine. So I selected 'pick' for the first commit, edited the commit log line to say 'Merge blah blah' and marked all the others as 'fixup' to remove their commit log lines. When I quit the editor, git started applying the commits and failed on the first one, with the error 'not currently on any branch' and that it couldn't apply the commit. I haven't been able to go past that. 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? Thanks. Diego.
