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>
1 file changed
tree: 97fc74e56782f6cf8be91d93408cef60f87fccda
  1. groups
  2. project.config