summaryrefslogtreecommitdiff
path: root/releasenotes/notes/cherry-pick-merges-9c78fd914b682671.yaml
blob: d5f1d14c5f6c4c7d5e5bd2ef3b5689db3814178b (plain)
1
2
3
4
5
6
7
---
features:
  - |
    The `cherry-pick` merger mode can now handle merges between branches by
    performing a `git merge` instead of `git cherry-pick` if the change has
    multiple parents. Previously, this would fail because git doesn't allow
    a merge to be cherry-picked.