Upstream Merge Conflict (2.4-develop) #114
Conversation
…shlist products are not being cleared
…shlist products are not being cleared
…shlist products are not being cleared
…shlist products are not being cleared
…shlist products are not being cleared
…ing cart after the session is expired Added "persistentLogoutClearDisable" step to MAGETWO-95118 mftf test
[Bengals] Functional Tests Mainline Deployment
tfa Checkbox presence test
…ountry is selected with entering zip code and verfiy without entering zipcode Added pr_exclude value for all test
tfa Checkbox presence test
Added 3rd party label
…into ACQE-7143-3
Test Fix
… and excluding virtual products Testcase Updated
[Spartans] BugFix Delivery
Implement extensible data re-encryption mechanism and decommission existing one
…child Products assignment added exclude
…into functional-test-automation-deployment
… when single store mode is enabled in the configuration deleted file
Added pr_exclude as it is a third party test
…o when single store mode is enabled in the configuration. Renamed the testcase name from ChangeFrontendLogoWithSingleStoreModeTest.xml to AdminChangeFrontendLogoWithSingleStoreModeTest.xml
…b.com/magento-gl/magento2ce into functional-test-automation-deployment
…into ACQE-7280
…frontend logo when single store mode is enabled in the configuration
…eployment [Bengals] Functional Tests Mainline Deployment
|
@rhoerr @sprankhub could you please check the conflicts? it's only 2 files (luckily) and I think we should leave "our" version of those changes |
|
The first file was changed in e53dbb6#diff-d1d04d0b346755fc707f0fd0bf0c9ff072af9b1080bc3df1f1822a3aad1039dd to fix unit test failures The second file was changed in 8e37779 to fix unit test failures In both cases, the intent is the same and I assume both versions work. I'm going to go with the upstream versions so this isn't divergent in the future. |
|
I can't directly resolve them because of |
|
can't make it either, no privileges |
This PR was automatically generated: a human is required.
Auto-merging app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/_files/invalidProductOptionsXmlArray.php
CONFLICT (content): Merge conflict in app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/_files/invalidProductOptionsXmlArray.php
Auto-merging app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/invalidProductTypesXmlArray.php
CONFLICT (content): Merge conflict in app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/invalidProductTypesXmlArray.php
Auto-merging composer.json
Auto-merging dev/tests/integration/framework/Magento/TestFramework/ApplicationStateComparator/_files/state-skip-list.php
Automatic merge failed; fix conflicts and then commit the result.