On 1/12/07, Guido van Rossum <[EMAIL PROTECTED]> wrote:
AFAIK Thomas just excludes these from the merge,
Indeed I would.
or occasionally (if
they make it through) they will be eradicated in the p3yk branch, and
then they'll be excluded from future merges of related changes (since
those woul
AFAIK Thomas just excludes these from the merge, or occasionally (if
they make it through) they will be eradicated in the p3yk branch, and
then they'll be excluded from future merges of related changes (since
those would be flagged as conflict).
On 1/12/07, Georg Brandl <[EMAIL PROTECTED]> wrote:
