mirror of
https://chromium.googlesource.com/crosvm/crosvm
synced 2024-10-23 12:49:55 +00:00
47e25297d5
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> |
||
|---|---|---|
| .. | ||
| check_cq_depend | ||
| merge_bot | ||
| rebase_for_review | ||
| setup_cargo | ||
| uprev_ebuilds | ||