Is it possible to merge two completely different branches?
Alexander Belchenko
bialix at ukr.net
Thu Jun 15 20:07:00 BST 2006
Aaron Bentley пишет:
> Alexander Belchenko wrote:
>> I have two independent branches with different files and with
>> independent history. I.e. they have no common files, no common history.
>> Now I want to merge second branch into first one.
>
>> How to make this operation and have a chance to keep history of merged
>> branch? Is it possible?
>
> Currently, the way to do it is to set the base to 0 explicitly. E.g.
> "bzr merge -r 0..-1 OTHER_BRANCH". When the nested-trees branch lands,
> we'll work on better support for this.
Thanks. It works OK.
--
Alexander
More information about the bazaar
mailing list