[webkit-dev] Using Git for WebKit development

[Philippe Normand]

On Tue, 2011-01-18 at 11:26 +0300, Konstantin Tokarev wrote:
> Hi all,
> 
> When I'm trying to cherry-pick or rebase something in my WebKit git clone,
> I constantly end up with conflicts in changelog files
> 
> How do you fight this problem?
> 

Add in your .git/config:

[merge "changelog"]
        driver = Tools/Scripts/resolve-ChangeLogs --merge-driver %O %A %
B

Philippe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part
URL: <http://lists.webkit.org/pipermail/webkit-dev/attachments/20110118/a829eca0/attachment.bin>