[webkit-dev] Patch process - let's make it better

[Dan Bernstein]

On Jul 10, 2009, at 4:17 PM, Chris Marrin wrote:

> The annoying part is the fact that I ALWAYS get conflicts in at  
> least one Changelog file when I try to check in. I have to fix these  
> by hand, do svn resolved, and try to check in again.

No you don’t. You can just use WebKitTools/Scripts/resolve-ChangeLogs;  
if you use WebKitTools/Scripts/update-webkit instead of just “svn up”,  
it will do it for you.