search

mage-os / mageos-magento2

Work in progress.
Open Software License 3.0
208 stars 41 forks source link

Upstream Merge Conflict (2.4-develop) #56

Closed mage-os-ci closed 10 months ago

mage-os-ci commented 10 months ago

This PR was automatically generated: a human is required.

Auto-merging app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php

damienwebdev commented 10 months ago

This conflict is fairly easy to resolve.

Original Code:

$connections = $this->_resource->getConnection();
$categoryTable = $connections->getTableName('catalog_category_product_index');

Our code:

$categoryTable = $this->tableMaintainer->getMainTable($this->getProductStoreId());

Their new code:

$categoryTable = $this->_resource->getTableName('catalog_category_product_index');

Our code is still correct and just needs to be re-applied.