tree merge with tree-related auto-resolution #5263

Job	Run time
test	10m 8s
test-fast (windows-latest)	14m 21s
pure-rust-build	1m 56s
test-fast (macos-latest)	3m 17s
test-journey	3m 53s
test-fast (ubuntu-latest)	3m 23s
cargo-deny	30s
cargo-deny-advisories	29s
check-blocking	3s
check-packetline (ubuntu-latest)	5s
lint	3m 47s
test-32bit	5m 26s
test-32bit-cross (armv7-linux-androideabi)	55s
test-fixtures-windows	14m 14s
WebAssembly (wasm32-unknown-unknown)	1m 7s
WebAssembly (wasm32-wasi)	36s
Tests pass	1s
	1h 4m 11s

Provide feedback