Dennis Kempin ee53dd075d tools/chromeos/create_merge: Automatically resolve conflicts ... The merge can trigger conflicts if a change has been cherry picked ahead of the merge. We always want to resolve conflicts by picking the incoming version from cros/main. BUG=None TEST=./tools/chromeos/create_merge Change-Id: I06694dd24b051fcdc12dbaccdbab552c72d7f2c4 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3494968 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>		2022-02-28 21:30:13 +00:00
..
chromeos	tools/chromeos/create_merge: Automatically resolve conflicts	2022-02-28 21:30:13 +00:00
contrib	enumn: switch to upstream crates.io version	2021-11-15 21:03:25 +00:00
examples	Reorganize usage doc and add example usage	2022-01-27 21:29:10 +00:00
impl	Convert CRLF line endings to LF	2022-02-25 23:02:59 +00:00
windows	Upstream windows build/test script	2022-01-28 00:55:08 +00:00
aarch64vm	testvm: Use prebuilts instead of building on-the-fly	2021-10-15 22:02:24 +00:00
cargo-doc	tools: Stop generating API docs for libvda	2021-12-09 18:01:34 +00:00
clippy	Pythonify clippy/fmt scripts and add common.py	2022-02-15 22:01:58 +00:00
dev_container	tools/dev_container: stop old container if new image is available	2022-02-18 00:18:57 +00:00
fmt	Pythonify clippy/fmt scripts and add common.py	2022-02-15 22:01:58 +00:00
install-aarch64-deps	Uprev rust toolchain to 1.56.1	2021-12-10 02:34:50 +00:00
install-armhf-deps	Uprev rust toolchain to 1.56.1	2021-12-10 02:34:50 +00:00
install-deps	Pythonify clippy/fmt scripts and add common.py	2022-02-15 22:01:58 +00:00
presubmit	Update ./tools/presubmit defaults and add --all mode	2022-02-10 22:04:18 +00:00
run_tests	Add test runner ./tools/run_tests	2021-10-15 22:12:03 +00:00
set_test_target	Add test runner ./tools/run_tests	2021-10-15 22:12:03 +00:00
x86vm	testvm: Use prebuilts instead of building on-the-fly	2021-10-15 22:02:24 +00:00