summaryrefslogtreecommitdiff
path: root/releasenotes/notes/cherry-pick-merges-9c78fd914b682671.yaml
Commit message (Collapse)AuthorAgeFilesLines
* merger: Handle merges with cherry-pick merge-modeJoshua Watt2022-05-111-0/+7
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>