> The resolve-ChangeLogs script will fix it for you automatically. > Perhaps we should make update-webkit (or some new wrapper type tool) > run resolve-ChangeLogs automatically. It's embarassing for me to admit, but I've been part of the WebKit project for nearly a year and didn't know about this -Brent