1. 14 Nov, 2018 1 commit
  2. 08 Nov, 2018 2 commits
  3. 07 Nov, 2018 1 commit
    • liyuqian's avatar
      Add engine merge method configuration (#23953) · 57c2fac1
      liyuqian authored
      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.
      57c2fac1