Noob questions for installing/upgrading Bazaar, and setting up/understanding feature branch workflow...
AtTrAcTiVe sUzI *_*
xlove_291 at hotmail.com
Mon Apr 13 15:47:35 BST 2009
kindly stop sending for me emails
> Date: Mon, 13 Apr 2009 08:05:59 -0500
> From: nmb at wartburg.edu
> To: dj_deipotent at yahoo.co.uk
> Subject: Re: Noob questions for installing/upgrading Bazaar, and setting up/understanding feature branch workflow...
> CC: bazaar at lists.canonical.com
> On 2009-04-13 2:04 AM, Richard B. wrote:
> >> bzr commit -m "merged new feature"
> > I meant to write
> > bzr commit -m "new feature attempt 1"
> > bzr commit -m "new feature attempt 2"
> > bzr commit -m "new feature attempt 3"
> > then once the feature was complete, I would do the final commit to
> > trunk ?
> The final commit doesn't take place on the trunk. When the feature is
> complete, you "merge" the branch to the trunk with
> cd Projects/Project1/trunk
> bzr merge ../branch/new_feature
> and resolve conflicts and then commit in the trunk directory.
Express yourself instantly with MSN Messenger! Download today it's FREE!
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the bazaar