On Sat, Aug 29, 2009 at 5:32 PM, Edward K. Ream<[email protected]> wrote:
> I'm already to push, but I'm get the same weirdness: > > "these branches have diverged" > > but when I do bzr merge it says "nothing to do" > > Help! Don't do it like last time, it nuked my revisions. Get a clean copy of trunk, merge your current trunk there, and push that. -- Ville M. Vainio http://tinyurl.com/vainio --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
