diff options
| author | Joshua Watt <JPEWhacker@gmail.com> | 2022-04-21 11:19:51 -0500 |
|---|---|---|
| committer | Joshua Watt <JPEWhacker@gmail.com> | 2022-05-11 10:06:18 -0500 |
| commit | 968c2ffd1fa316cff8a2b409a08ddc16231fd960 (patch) | |
| tree | 62344ecfc1906a87a490a01c4358e4ee9849da35 /releasenotes | |
| parent | fd34e0bd1c59a264fbff0c8f21e5b3d8e88806cf (diff) | |
| download | zuul-968c2ffd1fa316cff8a2b409a08ddc16231fd960.tar.gz | |
merger: Handle merges with cherry-pick merge-mode
Merges cannot be cherry-picked in git, so if a change is a merge, do a
`git merge` instead of a cherry-pick to match how Gerrit will merge the
change.
Change-Id: I9bc7025d2371913b63f0a6723aff480e7e63d8a3
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
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. |