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
..
create_merge	tools/chromeos/create_merge: Automatically resolve conflicts	2022-02-28 21:30:13 +00:00
setup_cargo	crosvm: Commit Cargo.toml with a useful description.	2022-01-06 22:59:57 +00:00
uprev_ebuilds