star or parallele merge

William Dode wilk-ml at flibuste.net
Thu Sep 29 08:20:37 BST 2005


Hi,

I've one project used by two clients. To now i use star merging, with 3
branchs, one main, and one for each clients. When i make a feature for
one i do it on his branch, when it's finish i merge it to the main
branch and from the main to the other one.

I wonder, now that i use bzr (i was using tla and bazaar), if it will
be possible and better to don't use the main branch, and just keep one
branch for each and merge between them directly. Specialy that i don't 
need the main branch for anything else (i'm alone for this private
project).

I don't think that it will change, but in fact i've two or more branch
by client (stable, dev).

Is there a sort of documentation about differents organisations of 
branchs on the wiki ?

-- 
William Dodé - http://flibuste.net





More information about the bazaar mailing list