On Tue, Sep 8, 2009 at 10:46 PM, Edward K. Ream <[email protected]> wrote:
> I changed this in the 47-maint branch, and would like to merge it into > the trunk, and maybe the 46-maint branch. > > Will there be any problems doing either of those merges? No problems in merging to trunk. You can safely merge stuff to trunk as much as you want. Generally, merging stuff from older branches (i.e. branches that were created earlier) to newer branches is typically safe. It's the reverse that breaks things. However, don't bother merging to 46-maint. If I do 4.6.4, I'll recreate the whole branch starting from 4.6.2 and cherry-pick the fixes I want (I want to avoid the trunk merge) -- 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 -~----------~----~----~----~------~----~------~--~---
