On Sat, Aug 29, 2009 at 6:09 PM, Ville M. Vainio<[email protected]> wrote:
> Get a clean copy of trunk, merge your current trunk there, and push that. BTW, this is what I always do when I get "branches have diverged". Just doing "bzr merge" collapses existing revisisions to single "commit after merge" revisions, which is not too neat. -- 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 -~----------~----~----~----~------~----~------~--~---
