[issue18967] Find a less conflict prone approach to Misc/NEWS

[Brett Cannon]

Brett Cannon added the comment:

You lose chronology in the directory, but not necessarily in the output; if you sort based on first commit time then you retain the chronological ordering in the merge.

----------

_______________________________________
Python tracker <report at bugs.python.org>
<http://bugs.python.org/issue18967>
_______________________________________