All,Can someone better than me (i.e anyone) help me resolve the issues with Pull Request 25220.
I followed the dev guide, but I assume that between me taking my fork of the cpython repository, and building my pull request, another pull request was merged into master.
It also appears that the Documentation build is failing with an rst reference tag error on part of the document I never changed.
I am finding it difficult to drive github to understand how to resolve the conflict (i.e how to retain both sets of changes) - so any help would be appreciated.
Regards, -- Anthony Flury *Moble*: +44 07743 282707 *Home*: +44 (0)1206 391294 *email*: anthony.fl...@btinternet.com <mailto:anthony.fl...@btinternet.com>
<<attachment: anthony_flury.vcf>>
_______________________________________________ Python-Dev mailing list -- python-dev@python.org To unsubscribe send an email to python-dev-le...@python.org https://mail.python.org/mailman3/lists/python-dev.python.org/ Message archived at https://mail.python.org/archives/list/python-dev@python.org/message/EPLT4DTJCTOJZ26YNMBORTL77WFLMKGD/ Code of Conduct: http://python.org/psf/codeofconduct/
