tree merge with tree-related auto-resolution #5233

Job	Run time
test	10m 14s
test-fast (windows-latest)	2m 28s
test-fast (macos-latest)	2m 27s
pure-rust-build	2m 1s
test-fast (ubuntu-latest)	2m 43s
test-32bit	5m 24s
test-32bit-cross (armv7-linux-androideabi)	1m 16s
test-fixtures-windows	14m 30s
test-journey	4m 16s
cargo-deny	28s
cargo-deny-advisories	29s
check-blocking	11s
check-mode	4s
check-packetline (ubuntu-latest)	4s
lint	3m 54s
WebAssembly (wasm32-unknown-unknown)	1m 7s
WebAssembly (wasm32-wasi)	41s
Tests pass	1s
	52m 18s

Provide feedback