tree c86847e3f9f0dd82762975cece31be22d16ee96d
parent 22bce8fbc9f1f7d7351a6d65dff086943ef657f7
author Eric Boren <borenet@google.com> 1626811422 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> 1626874182 +0000

[autoroll] If rebasing CL fails due to a merge conflict, abandon it

Change-Id: I5d7f470e7dce565a4f773b17396da434f102c00d
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/430622
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>