On Mon, 24 Mar 2008 06:16:20 -0500 "Kent Tenney" <[EMAIL PROTECTED]> wrote:
> > > Terry, please fix this directly in the trunk. Thanks. > > > > 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. But what does that mean? Isn't merge strictly from other branch to this branch? So I keep my branch up to date with Edward's, but if anyone's going to merge into Edward's doesn't it have to be him? And pushing from my branch to Edward's doesn't seem right either. I know there's `bzr send` I could use to email the content to merge to Edward, but I don't really see what that achieves, unless he has a work flow which makes that approach easier - I suspect it's just as easy for him to merge from my branch. I suppose the other other thing I could do is merge my branch into my local copy of the trunk, and then push that back at the public trunk, if I have rights to do so. Perhaps that's the most obvious answer, I think I would then be doing the same thing as Edward. And perhaps that's functionally equivalent to my original "Merge the trunk into (my local copy of) my branch and then push it back" idea. For the question "How do I do that?" bzr's stock answer "Anyway you want" is cool, but takes a while to used to. Cheers -Terry --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
