feat: add script to auto-resolve CHANGELOG.md merge conflicts - #9994

Open

Mrtenz wants to merge 10 commits into

mainfrom

mrtenz/changelog-merge-conflicts

Commits on Aug 27, 2026

Add script to auto-resolve CHANGELOG.md merge conflicts
Mrtenz
committed
abf90e0

Commits on Aug 28, 2026

Simplify changelog conflict merge helpers
Mrtenz
committed
3895ac5
Fix auto-changelog version
Mrtenz
committed
4720cb6
Fix formatting
Mrtenz
committed
32b2b69
Fix changelog entry dedupe dropping distinct same-PR entries
Mrtenz
committed
f6c8c03
Merge into "ours" instead of "theirs" to preserve entry order
Mrtenz
committed
90feb0b
Update scripts/merge-changelog-conflicts.ts

Mrtenz
and
FrederikBolding
authored
cd4046c
Fix test
Mrtenz
committed
e6f1372
Don't stage resolved CHANGELOG.md files automatically
Mrtenz
committed
e098056
Normalize reported paths to the OS-native separator
Mrtenz
committed
a4d18c6