mirror of
https://github.com/hashicorp/packer.git
synced 2026-09-20 06:51:39 -04:00
Lucas Bajolet
bf4ce5a91c
The current setting for applying backports from the main branch to a release branch attempts to pick commits one by one and merge them with a merge commit to the release branch. This seldom causes an issue where the backport assistant picks-up every commit from the beginning of the release branch, and applies them through one big merge commit, on top of everything else that was already merged into the release branch. To limit the times it happens, we change how the backport assistant behaves to only apply one squashed commit that contains the changes from the MR into the release branch.