build

polish/4147: Change conflict hint if decendants resolves conflict. #12855

Job	Run time
build (ubuntu-latest)	4m 19s
build (macos-14)	3m 22s
build (windows-latest)	9m 38s
build (ubuntu-latest, --all-features)	5m 25s
Build jj-lib without Git support	53s
Check protos	28s
Check formatting	25s
cargo-deny (advisories)	37s
Check that MkDocs can build the docs	26s
Clippy check	2m 37s
cargo-deny (bans licenses sources)	27s
Check that MkDocs can build the docs with Poetry 1.8	32s
	29m 9s

Provide feedback