On Mon, 24 Mar 2008 11:22:11 -0500 "Kent Tenney" <[EMAIL PROTECTED]> wrote:
> > 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? > > I don't think so. > This page is useful > http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html I think I was just unnecessarily picking over the distinction between merging from and pushing to. I know I can push to the trunk, given sufficient rights. When Edward said "fix it on the trunk" I should have read "push the fix to the trunk" instead of "merge the fix to the trunk". Unless I'm still way off base, even Edward can't use merge to directly alter the lp hosted copy of the trunk. Of course (there had to be an of course) if I or Edward have a bound checkout of the trunk then a commit to the local copy requires a successful commit to the remote copy, but then it's still "commit the fix to the trunk", rather than merge. Ok, I'm done now, move along everyone, nothing to see here :-) 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 -~----------~----~----~----~------~----~------~--~---
