On Mon, 24 Mar 2008 11:04:27 -0500 John Griessen <[EMAIL PROTECTED]> wrote:
> I've been using git some, and I imagine a lot of the terminology is > the same. Merging is possible to any repository or branch, so the > meaning is not necessarily relative to one central repos. I wouldn't rely on bzr's use of terminology being compatible with anything else. In this case the issue was that you can't merge *to* another (remote) branch, only from. So you merge to a local copy of the remote branch (i.e. merge from your local dev. branch) and then push to the remote branch. Bzr let's you get a copy of remote content using merge, pull, checkout, update, and, to be picky, branch. 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 -~----------~----~----~----~------~----~------~--~---
