On 29 September 2016 at 04:26, Zachary Ware <zachary.ware+py...@gmail.com> wrote: > On Wed, Sep 28, 2016 at 10:04 PM, Terry Reedy <tjre...@udel.edu> wrote: >> On 9/28/2016 9:57 PM, terry.reedy wrote: >>> https://hg.python.org/cpython/rev/02eb35b79af0 >> >> >> (2nd try) I mistakenly null merged from 3.5 to default. >> Should a now do a proper null merge from 3.5 to 3.6 to default? >> Should I revert this null merge?
FYI I committed some merges (04060fa4428d and ae0c983d3c65) which should have fixed this all up. > You aren't the only one who's missed 3.6 since it was branched :). If > there are changes in 3.5 that should not be in 3.6, you should go > ahead and do a null merge from 3.5 -> 3.6 -> default. If the changes > in 3.5 are already in 3.6, I'd just leave it as is; it will clear up > when somebody next merges something. In this case, my automatic merge process gave conflicts and spooky “ambiguous merge” warnings, so in this case I think it was good to deal with it sooner rather than later. _______________________________________________ Python-Dev mailing list Python-Dev@python.org https://mail.python.org/mailman/listinfo/python-dev Unsubscribe: https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
