diff options
| author | Zuul <zuul@review.opendev.org> | 2022-05-19 20:45:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-05-19 20:45:17 +0000 |
| commit | 7f6287cbfebe53082c3bb59ab07fb547ebc2b3a6 (patch) | |
| tree | 2a434edd06dce5b5c1e26a62fee1fd779d43ce0e /releasenotes | |
| parent | e00a7647b9a54c4c042162ff4b014f5f97f037fd (diff) | |
| parent | 968c2ffd1fa316cff8a2b409a08ddc16231fd960 (diff) | |
| download | zuul-7f6287cbfebe53082c3bb59ab07fb547ebc2b3a6.tar.gz | |
Merge "merger: Handle merges with cherry-pick merge-mode"
Diffstat (limited to 'releasenotes')
| -rw-r--r-- | releasenotes/notes/cherry-pick-merges-9c78fd914b682671.yaml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/releasenotes/notes/cherry-pick-merges-9c78fd914b682671.yaml b/releasenotes/notes/cherry-pick-merges-9c78fd914b682671.yaml new file mode 100644 index 000000000..d5f1d14c5 --- /dev/null +++ b/releasenotes/notes/cherry-pick-merges-9c78fd914b682671.yaml @@ -0,0 +1,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. |