On Mon, Mar 24, 2008 at 7:15 AM, Ville M. Vainio <[EMAIL PROTECTED]> wrote: > > On Mon, Mar 24, 2008 at 1:16 PM, Kent Tenney <[EMAIL PROTECTED]> wrote: > > > > Not sure how I'd do that. Merge the trunk into (my local copy of) my > > > branch and then push it back? I can do that? > > > > My understanding is that you merge to Edward's branch from your branch. > > Edward reviews and resolves conflicts if any, commits. > > Just join the leo-editor-team on launchpad and you can commit to trunk > (after approved as a member of the team).
I think the bzr folks use different terminology > commit to trunk you _commit_ locally. If the changes are going elsewhere, it's merging or pushing. It seems the notion of _trunk_ is deprecated, they are all branches. > > -- > Ville M. Vainio - vivainio.googlepages.com > blog=360.yahoo.com/villevainio - g[mail | talk]='vivainio' > > > > > > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "leo-editor" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/leo-editor?hl=en -~----------~----~----~----~------~----~------~--~---
