On Fri, Aug 28, 2009 at 6:10 PM, Edward K. Ream<[email protected]> wrote:
> Something strange happened. Bzr said that the branches have diverged, > but when I did a bzr merge bzr said "nothing to do". > > I "fixed" this by doing bzr push --overwrite. I have no time to investigate further, but it sounds like something you should never do. Local problems should always be solved locally, possibly by bzr pull-ing to a clean directory. -- 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 -~----------~----~----~----~------~----~------~--~---
