Upstream Merge Conflict (2.4-develop)#152
Merged
fballiano merged 45 commits into2.4-developfrom Aug 13, 2025
Merged
Conversation
…ure through the GraphQL
…group and cart rules
…gento2ce into LYNX-889
…gento2ce into LYNX-889
Co-authored-by: Deepak Soni <deepaksoni@adobe.com>
LYNX-892: [AC-2.4.9] Introduce OrderTotal.grand_total_excl_tax field
LYNX-889: [AC-2.4.9] Merging guest and customer cart logic using Admin Configuration
…sage or is_available field when cart inventory check is disabled
…ing Admin Configuration" (#369) Due to PAT failure on delivery PR, need to revert - magento-commerce/magento2ce#9920
… for products with Multi-Source Inventory (MSI) and default stock is 0 (#370)
Contributor
|
this conflict should be fairly easy to solve, it impacts only 3 xml files 
3 I'm in doubt because I'd keep our change but upstream deleted the file... so I don't know what to do, actually I'd keep our file @rhoerr what do you think? |
Contributor
Contributor
|
done! |
fballiano
approved these changes
Aug 13, 2025
rhoerr
approved these changes
Aug 13, 2025
Contributor
rhoerr
left a comment
rhoerr
left a comment
There was a problem hiding this comment.
Approving upstream merge conflict resolve
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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/CatalogRule/etc/config.xml deleted in e347a9f and modified in HEAD. Version HEAD of app/code/Magento/CatalogRule/etc/config.xml left in tree.
Auto-merging app/code/Magento/Customer/etc/config.xml
CONFLICT (content): Merge conflict in app/code/Magento/Customer/etc/config.xml
Auto-merging app/code/Magento/Quote/etc/di.xml
Auto-merging app/code/Magento/SalesRule/etc/config.xml
CONFLICT (content): Merge conflict in app/code/Magento/SalesRule/etc/config.xml
Automatic merge failed; fix conflicts and then commit the result.