tree 72465b09787af534bc1d79efa1c7b7e53a1aa514
parent 87274fcd2b5511540e91ede5e87ee8da070bb689
author Ravi Mistry <rmistry@google.com> 1627395869 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> 1627411691 +0000

[skcq] Detect and post a better comment when merge conflicts occur

Before: https://screenshot.googleplex.com/5xoSVhpot6prPLz
After: https://screenshot.googleplex.com/4z4godsh4WVyZSV

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