If you choose to merge, I would prefer that you rebase your changes before to avoid multiple merges. IMO the best to avoid merges at all :-)
Did someone review your large change? Victor 2015-04-01 18:09 GMT+02:00 Brett Cannon <bcan...@gmail.com>: > The implementation for PEP 488 is basically done (sans Windows installer > stuff). I did the work in a features repo at > https://hg.python.org/features/pep-488/ . Once I have addressed reviewer > comments at http://bugs.python.org/issue23731 , would people prefer I simply > push the features repo to hg.python.org/cpython and have the more granular > history but have various "merge default" commits, or would people rather I > do one massive commit? > > _______________________________________________ > python-committers mailing list > python-committers@python.org > https://mail.python.org/mailman/listinfo/python-committers > _______________________________________________ python-committers mailing list python-committers@python.org https://mail.python.org/mailman/listinfo/python-committers
