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

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

Provide feedback