Skip to content

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Oct 20, 2025

task-3711225

Forward-Port-Of: #14878
Forward-Port-Of: #14824

@robodoo
Copy link
Collaborator

robodoo commented Oct 20, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 20, 2025

@lman-odoo @auva-odoo cherrypicking of pull request #14824 failed.

stdout:

Auto-merging content/applications/websites/ecommerce/checkout.rst
CONFLICT (content): Merge conflict in content/applications/websites/ecommerce/checkout.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-prices-page-lman-471608-fw branch from 57daa95 to 932f733 Compare October 20, 2025 13:11
@C3POdoo C3POdoo requested review from a team October 20, 2025 13:14
@lman-odoo lman-odoo removed request for a team October 20, 2025 13:19
@lman-odoo lman-odoo force-pushed the 19.0-18.0-ecommerce-prices-page-lman-471608-fw branch from 932f733 to e67777d Compare October 20, 2025 14:02
@lman-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Oct 20, 2025
task-3711225

closes #14937

Signed-off-by: Audrey Vandromme (auva) <auva@odoo.com>
Signed-off-by: Larissa Manderfeld (lman) <lman@odoo.com>
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.

3 participants