commit | 84f94013589590bf0f78a3329759898c2eb28958 | [log] [tgz] |
---|---|---|
author | Sean Abraham <seanabraham@chromium.org> | Mon Apr 27 16:32:52 2020 |
committer | Sean Abraham <seanabraham@chromium.org> | Mon Apr 27 16:36:14 2020 |
tree | 97fc74e56782f6cf8be91d93408cef60f87fccda | |
parent | 40eec92856876bf92be8db73e8a070ff66f83a45 [diff] |
Use "rebase always" merge strategy The cherry pick strategy has been giving us trouble. BUG=chromium:1075589 Change-Id: I4d1053263d0c8b11a2ebaaeec4c25fe8c23b7abf Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/production_infrastructure/+/2168151 Reviewed-by: Sean Abraham <seanabraham@chromium.org> Commit-Queue: Sean Abraham <seanabraham@chromium.org> Tested-by: Sean Abraham <seanabraham@chromium.org>