Bazaar recommended practices
Sabin Iacob
iacobs at m0n5t3r.info
Wed Jul 9 12:57:22 BST 2008
Alexandros Frantzis wrote:
> 1. How do you handle small changes to a project: do you create a new
> branch for every small change, have a long standing eg 'trivial' branch
> or change the local branch of trunk directly?
>
change local trunk (which is bound to the central trunk, saves me a
push) directly
> 2. Where do you commit branches to the mainline from: do you merge the
> current (local copy of) trunk into a feature branch and push from there,
> the other way round or perhaps keep a second branch of trunk used just
> for merging and pushing?
>
for the project "thing" I have a "thing-bleeding" branch where I work on
features, and merge them into the local trunk when (I think they are)
complete; I occasionally merge trunk into the "-bleeding" branch to get
small changes that I did directly on trunk
More information about the bazaar
mailing list