Hi! I managed to checkout multiple svn branches into one git repository following the instruction described on this site: http://www.dmo.ca/blog/20070608113513/
Now i've done the following - made changes to branch branch/xyz - checked out trunk - updated trunk by git-svn rebase - then i did: git merge branch/xyz Instead of merging my changes back into trunk, the merge resulted in one conflict for every change i did in the branch. What i'm doing wrong here? Best regards, Gernot --~--~---------~--~----~------------~-------~--~----~ 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-users@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 -~----------~----~----~----~------~----~------~--~---
