On Thu, Mar 12, 2020 at 4:55 PM Matt Wilkie <[email protected]> wrote:
I don't get why never merge from (any branch) into a release branch. > Yesterday I updated #1058 <https://github.com/leo-editor/leo-editor/issues/1058> to describe the process. The rule is that *devel* should never be merged into a release branch. The rationale is straightforward: we want to be able to freely merge new branches *into* devel while a release is in progress. For example, 6.2 will contain only 6.2 stuff, but devel might soon contain 6.3 stuff. Otoh, suppose someone reports a bug that really should be fixed in 6.2. I'll create a branch based on 6.2 (not devel), fix the bug, and merge branch into *both* devel and 6.2. Edward -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/leo-editor/CAMF8tS0NEddbWwFgeu5UUw6utu%3DuzSK%2BO4R1m6p1u%2BoxEjTy9A%40mail.gmail.com.
