On Aug 28, 9:31 am, "Edward K. Ream" <[email protected]> wrote:
> I'll be merging the 46-maint branch with the trunk
Done at the trunk at rev 2343.
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.
This appears to have worked. Please let me know immediately if you
see any problems.
Thanks. I'll delay merging the trunk into the one-node branch until I
know I haven't created more problems...
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
-~----------~----~----~----~------~----~------~--~---
