[webkit-dev] changelogs: a reprise
cjerdonek at webkit.org
Tue Jan 26 10:19:50 PST 2010
On Tue, Jan 26, 2010 at 9:55 AM, David Kilzer <ddkilzer at webkit.org> wrote:
> I think I mentioned this before, but for git users, this can be solved in the short term by a merge driver that uses resolve-ChangeLogs (once it knows how to be invoked by git as a merge driver):
This seems like a good idea.
> I started hacking on resolve-ChangeLogs to be invoked by three arguments this way, but haven't had time to finish it.
I came across this report:
"I looked briefly at writing this today. The merge driver is passed paths to 3
temp files. 1. previous version 2. other branch version. 3. this branch
version. Maybe one of the other WebKit git users will get further than I did."
Looks like you and Eric might want to connect. ;)
More information about the webkit-dev