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
signature.asc
Description: This is a digitally signed message part
_______________________________________________ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
