On Sep 14, 2015, at 5:15 PM, Colin P. McCabe <cmcc...@apache.org> wrote:
> Let's stay focused on the title of the thread-- CHANGES.txt-- and > discuss issues surrounding releasing trunk in a separate thread. It directly addresses the thread: if one isn’t cherry picking patches because there aren’t multiple primary branches in development, the changes.txt conflicts effectively go away.