On Mon, Apr 14, 2008 at 5:39 PM, Terry Brown <[EMAIL PROTECTED]> wrote:
1. committed some trivial changes in local:leo.tb > 2. merged launchpad:trunk into local:leo.tb > 3. resolved conflict in leoProjects.txt by accepting the version from > launchpad:trunk > 4. committed in local:leo.tb > 5. pushed local:leo.tb to launchpad:trunk (without --overwrite) > 6. pushed local:leo.tb to launchpad:leo.tb (without --overwrite) > > I think 5. was wrong, although it doesn't look that obviously wrong > reading it like that. Hmm. I guess you are right. Best to push from your local:trunk to the launchpad:trunk. But still, this is pretty counter-intuitive. Edward --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
