[Python-Dev] Merging 3.2 to 3.3 is messy because "Misc/NEWS"

[Stephen J. Turnbull]

Jesus Cea writes:

 > A bit of discipline and, voila, automatic flawless merges! :-)

Doesn't work that way, sorry. The discipline required is isomorphic to
that required by threaded programs.  See multiple threads on
python-ideas for why that is less than automatic or flawless. :-)

Antoine's suggestion looks to be analogous to STM.