Upstream Merge Conflict (2.4-develop) #125
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…age as it is missing orderRef
…ConfigResolverTest.php Co-authored-by: Shantanu Dasgupta <[email protected]>
LYNX-689: Guest user confirmation url is redirected to order status page as it is missing orderRef
Co-authored-by: Deepak Soni <[email protected]>
…gento2ce into LYNX-699
LYNX-697: Deliver subtotals fields in placeOrder mutation
LYNX-753: Deliver Terms & Conditions configuration in StoreConfig
LYNX-699 Cannot return null for non-nullable field TaxItem.title on placeOrder GQL
AC-13818::Make ES8 to be default for 2.4.8 instead of ES7
# Conflicts: # app/code/Magento/Config/Test/Unit/Model/Config/_files/invalidSystemXmlArray.php # app/code/Magento/Elasticsearch7/Test/Unit/Model/DataProvider/Base/SuggestionsTest.php # app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php # app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/_files/invalidExportXmlArray.php # app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportMergedXmlArray.php # app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportXmlArray.php # app/code/Magento/Integration/Test/Unit/Model/Config/XsdTest.php # app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/templates/html/notices.phtml # app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/XsdTest.php
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR was automatically generated: a human is required.
CONFLICT (modify/delete): app/code/Magento/Elasticsearch7/Test/Unit/Model/DataProvider/Base/SuggestionsTest.php deleted in 71bfd9a and modified in HEAD. Version HEAD of app/code/Magento/Elasticsearch7/Test/Unit/Model/DataProvider/Base/SuggestionsTest.php left in tree.
Auto-merging composer.json
Automatic merge failed; fix conflicts and then commit the result.