18.01.2011, 12:52, "Jeremy Orlow" <jor...@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 <pnorm...@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 >>
Thanks for all replies! -- Regards, Konstantin _______________________________________________ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
