968c2ffd1f
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>
8 lines
281 B
YAML
8 lines
281 B
YAML
---
|
|
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.
|