On Tue, Sep 8, 2009 at 2:56 PM, Ville M. Vainio <[email protected]> wrote:
> > No problems in merging to trunk. You can safely merge stuff to trunk > as much as you want. Good. That seems like the essential capability. > 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. > Ok. I'll avoid that. > > 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) > Alright. I'll only change the 47-maint branch. 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 -~----------~----~----~----~------~----~------~--~---
