We need to wait the fix in
https://skia-review.googlesource.com/c/buildbot/+/169724
to land in order to enable the rebase merge method again.
TBR: goderbauer
We'll land this quickly without waiting for presubmit checks
to unblock our engine roller.
In order for this to take effect, https://skia-review.googlesource.com/c/buildbot/+/167200
needs to be landed and deployed.
The /bin/internal/engine.merge_method file controls how we merge a pull
request created by the engine auto-roller. If it's squash, there's only one
commit for a pull request no matter how many engine commits there are inside
that pull request. If it's rebase, the number of commits in the framework is
equal to the number of engine commits in the pull request. The latter method is
easier to detect regressions but cost more test resources.
