mirror of
https://github.com/dokku/dokku.git
synced 2026-02-24 12:12:08 +01:00
ea89fb5810
This change allows us to have an integration branch for each release that contains tested changes for each minor. Rather than have to block merging until a minor is ready for release - and subsequently have to deal with constant rebase issues - we will now have an integration branch per-release. This will be the target for minor-related changes - mostly new features, but also refactors and bc-breaks - while the trunk branch will stay safe for merging patch changes. Note that we'll still need to rebase the integration branch every so often, but at least this allows us to avoid many long-running MRs.