Whole tree up to date before committing
Ian Clatworthy
ian.clatworthy at canonical.com
Tue Oct 27 05:38:43 GMT 2009
Óscar Fuentes wrote:
> One possible solution is to use one branch per developer on the central
> location (where the master branch resides). A developer tests his
> changes, merges from `master' and pushes to his personal central
> branch. Then, automatically, this branch pushes to `master'.
>
> merge push
> master -----> joe's local branch ------> joe's central branch
> ^ |
> |_______________________________________________|
> push
As a point of reference, the way we develop Bazaar is quite similar.
Each developer has a local integration branch which gets pushed to a
central integration branch which PQM then merges into master. I suspect
you also want merge, not push, from joe's central branch into master.
Ian C.
More information about the bazaar
mailing list