build

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

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

Provide feedback