changelog-merge ends the CHANGELOG.md conflict dance

Keep the changelog, avoid the conflicts

Parallel pull requests that add unrelated features both insert lines at the top of CHANGELOG.md, producing a merge conflict even though the code merges cleanly. changelog-merge, a Rust tool from Cachix, understands Keep a Changelog structure and automatically keeps both additions. It integrates with devenv or plain Git via .gitattributes, and still leaves markers when two branches rewrite the same entry incompatibly.