[webkit-dev] Using Git for WebKit development
annulen at yandex.ru
Tue Jan 18 05:19:55 PST 2011
18.01.2011, 12:52, "Jeremy Orlow" <jorlow at chromium.org>:
> The info is on https://trac.webkit.org/wiki/UsingGitWithWebKit as well.
> On Tue, Jan 18, 2011 at 8:42 AM, Philippe Normand <pnormand at igalia.com> wrote:
>> 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 %
Thanks for all replies!
More information about the webkit-dev