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
