Pieter Hoste

Okay, I'll attempt to solve them. I've already identified the commits that introduced the conflicts (all related to phpunit 10 compatibility): - https://github.com/magento/magento2/commit/978a24fb21628dccda731e87c16a1fe817a082d8#diff-b11c649376c43c8d652885e7cd4a3e211cef9b6de591bd7c08a6ca3ea7cbaa55 - https://github.com/magento/magento2/commit/2e200ab9169e4ad907dcd9f0b648be9a5bf78552#diff-42bc2e6c5a0041b429aa6bf03602e2fa0d5e7a93e52c33d52a69c7047e79eee4 - https://github.com/magento/magento2/commit/3dfda8e44740f3475d8b7651bb4dee5692e55f50#diff-7267ac01a411b234c6e7fe51ad7cea967824112c1fb2b7c9a27a4c578fc660b2

Rebased, solved conflicts and force pushed. Only 13 errors got fixed now instead of 16 before, because in the commits referenced earlier some fixes were already done, these are the...

Failed tests don't seem related to changes here, so can be reviewed again.

@kandy: maybe it helps if a senior developer could have a look here? The engcom squad seems to not understand this problem because I think they miss some deeper knowledge...

To make the issue more clear, this seems to be a response to a question asked on #38591, I would suggest we close this one and re-open #38591 again.