Had to do a git stash, but the upgrade still did not work. Tried deleting all references to tinymce in the database, but the upgrade still failed to proceed.
I finally copied the tinymce falder back onto the server, and then the upgrade to Moodle 4.2+ (Build: 20230504) successfully completed.