[webkit-dev] Using Git for WebKit development

[Jeremy Orlow]

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 %
> B
>
> Philippe
>
> _______________________________________________
> webkit-dev mailing list
> webkit-dev at lists.webkit.org
> http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.webkit.org/pipermail/webkit-dev/attachments/20110118/c7f6221c/attachment.html>