[Python-Dev] Merging 3.2 to 3.3 is messy because "Misc/NEWS"
petri at digip.org
Sun Nov 27 20:33:29 CET 2011
Jesus Cea wrote:
> On 12/11/11 16:56, Éric Araujo wrote:
> > Ezio and I chatted a bit about his on IRC and he may try to write
> > a Python parser for Misc/NEWS in order to write a fully automated
> > merge tool.
> Anything new in this front? :-)
I don't see what's the problem really. The most common case is to have
one conflicting file with one conflict. I'm completely fine with
removing the conflict markers and possibly moving my own entry above
the other entries.
More information about the Python-Dev