Hello! On a git-svn tracked project, I have created several feature branches, each beeing a child of the master branch. What I now want to do, is combine all these features in a "build" branch. This itself is no problem:
git co -b build git merge features/feature1 features/feature2 Where I get into trouble, is when there are new commits in the master branch. First I do a rebase of features/feature1 and features/feature2 to the new master HEAD and resolve all conflicts. But what do I do with my "build" branch now? Doing a rebase I will get the same conflicts as I had before when rebasing the feature branches. The only solution I see right now, is to drop the build branch and create a new one. Any ideas / comments? Tobias --~--~---------~--~----~------------~-------~--~----~ 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 [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/git-users?hl=en -~----------~----~----~----~------~----~------~--~---