On Mon, Aug 21, 2006 at 10:47:47PM +0200, Johannes Schindelin wrote: > Ideally, you really would have a common revision to start from. Since you > do not have that yet, you have to go low-level for the first octopus. > > Suppose you have the last common version as tip of branch "ancestor", you > could do > > git merge-octopus ancestor -- HEAD branch1 branch2 ... This one didn't work. It complains about not having common ancestors too. I did a manual merge anyway. > After this -- if everything went well -- you should have a committable > state in the index. Before you commit, you should do > > git rev-parse branch1 > .git/MERGE_HEAD > git rev-parse branch2 >> .git/MERGE_HEAD > git rev-parse branch3 >> .git/MERGE_HEAD > ... > > to tell git that you want to commit an octopus merge. This will tell > git-commit what the parents of the merge are. This trick did it. Now I have a proper merge commit with common ancestors. Thanks a lot. -- Blu. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Thu Aug 24 10:38:19 2006
This archive was generated by hypermail 2.1.8 : 2006-08-24 10:38:54 EST