I've never had a problem solving merge conflicts in CHANGELOG. That's usually pretty easy, since you most likely want to keep both blocks. I'd say "VOTE, merge, update CHANGELOG" makes it a lot easier to forget to update CHANGELOG. Furthermore, even if 2 or 3 people reviewed and voted on the PR, I'm pretty sure that none of them will verify that CHANGELOG was in fact updated once the merge is done.
Cheers, Daniel On Thu, Feb 11, 2016 at 12:10 AM, Marko Rodriguez <okramma...@gmail.com> wrote: > Hi, > > I feel like we have lost data cause of merge conflicts with CHANGELOG in > the past. Instead of updating the CHANGELOG (and update.asciidoc) prior to > VOTE, I have been adding that information to the PR. For example, see this > PR: https://github.com/apache/incubator-tinkerpop/pull/210 … Then when > VOTE passes, I merge up, update CHANGELOG and update.asciidoc and merge > down. > > I think this is safer… What do others think? > > Marko. > > http://markorodriguez.com > >
