build

draft: polish - Change conflict hint if decendants resolves conflict. #12817

Job	Run time
Check protos	29s
Build jj-lib without Git support	49s
build (ubuntu-latest)	4m 25s
cargo-deny (advisories)	23s
build (macos-14)	3m 33s
Clippy check	2m 39s
cargo-deny (bans licenses sources)	24s
Check that MkDocs can build the docs	25s
build (windows-latest)	10m 28s
Check that MkDocs can build the docs with Poetry 1.8	25s
build (ubuntu-latest, --all-features)	5m 31s
Check formatting	36s
	30m 7s

Provide feedback