On Thu, Dec 6, 2012 at 4:51 PM, <asha...@chromium.org> wrote: > I don't think the rule is to *only* update ChangeLog.google*. The rule > is to update ChangeLog, but also update ChangeLog.google*.
Just ChangeLog.google*, actually. When cherry picking revisions from other branches, it's better not to update ChangeLog. It's not really necessary and it will actually cause merge conflicts later. I'll clarify the developer notes. Thanks. Diego.
