Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Nov 13, 2025

task-3339294

Forward-Port-Of: #15121

@robodoo
Copy link
Collaborator

robodoo commented Nov 13, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Nov 13, 2025

@lman-odoo @xpl-odoo cherrypicking of pull request #15121 failed.

stdout:

Auto-merging content/applications/websites/ecommerce.rst
Auto-merging content/applications/websites/ecommerce/checkout.rst
Auto-merging content/applications/websites/ecommerce/customer_accounts.rst
CONFLICT (content): Merge conflict in content/applications/websites/ecommerce/customer_accounts.rst
Auto-merging content/applications/websites/ecommerce/products/prices.rst
CONFLICT (content): Merge conflict in content/applications/websites/ecommerce/products/prices.rst

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@lman-odoo lman-odoo force-pushed the 19.0-18.0-ecommerce-b2b-b2c-page-lman-476962-fw branch from 548a66f to 5b750e3 Compare November 14, 2025 06:29
@C3POdoo C3POdoo requested a review from a team November 14, 2025 06:31
@lman-odoo lman-odoo removed the request for review from a team November 14, 2025 06:33
@lman-odoo
Copy link
Contributor

@robodoo r+

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants