conflicts: materialize simplified conflicts for each file #11686

Job	Run time
build (ubuntu-latest)	4m 2s
Build jj-lib without Git support	43s
build (macos-14)	3m 24s
build (windows-latest)	8m 58s
cargo-deny (advisories)	23s
Check protos	33s
build (ubuntu-latest, --all-features)	5m 3s
cargo-deny (bans licenses sources)	26s
Clippy check	2m 32s
Check that MkDocs can build the docs	26s
Check that MkDocs can build the docs with Poetry 1.8	24s
Check formatting	14s
	27m 8s

Provide feedback