Dennis Kempin 47e25297d5 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>		2022-06-03 19:12:04 +00:00
..
chromeos	merge_bot: Handle merge conflicts	2022-06-03 19:12:04 +00:00
contrib	base: replace PollToken with EventToken tree-wide	2022-06-02 22:30:38 +00:00
examples	crosvm: add example rust baremetal app that can be booted with crosvm	2022-05-10 23:36:47 +00:00
impl	tools: dev_container: add missing script to Dockerfile	2022-06-02 05:56:53 +00:00
windows	add release / debug modes to build_test script for building windows	2022-04-21 17:09:29 +00:00
.vpython3	infra: Small process improvements	2022-05-27 20:59:12 +00:00
aarch64vm
bindgen-all-the-things	tools: update bindgen docs.	2022-04-29 21:02:26 +00:00
cargo-doc	tools/cargo-doc: exclude crosvm-fuzz	2022-05-06 20:47:00 +00:00
clippy	tools/clippy: Allow json formatted output	2022-05-05 22:22:53 +00:00
dev_container	dev_container: Fix reuse logic and add testing	2022-05-31 21:54:23 +00:00
fmt	Document memory layout.	2022-05-06 12:09:40 +00:00
health-check	health-check: Add option to run only some checks	2022-05-26 01:03:59 +00:00
install-aarch64-deps
install-armhf-deps
install-deps
install-docs-deps
presubmit
run_tests
test_target
x86vm