tree 2530e178ad2f0d761c3ef558a1fe9dd37c2d7ae5
parent ca66addad0f4448a8b8607e119f8ffc2a39c57e4
author Dennis Kempin <denniskempin@google.com> 1654279271 +0000
committer Dennis Kempin <denniskempin@google.com> 1654283524 +0000

merge_bot: Handle merge conflicts

The bot cannot resolve those automatically. To ease the process, we
will upload the merge anyway, so the oncall can download and resolve
the conflict.

Dry runs are not created when there are conflicts, they are bound
to fail and there is nothing the oncall can do about conflicts
until the actual merge is generated.

BUG=b:234847583
TEST=MERGE_BOT_TEST=1 ./tools/chromeos/merge_bot update-merges / update-dry-runs

Change-Id: I409e6b99284ff8a98b504b390c35329875d6a8b9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3689544
Reviewed-by: Anton Romanov <romanton@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>